From 21c45fba0e0c7d49e09e965790d31607773d753e Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 21 Jun 2022 10:17:47 +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

---
 ...icpointnucleicmonitoring-add-or-update.vue |  76 +++-------
 .../point/icpointnucleicmonitoring.vue        |  23 +--
 ...pointvaccinesinoculation-add-or-update.vue | 139 +++++++-----------
 .../point/icpointvaccinesinoculation.vue      |  21 +--
 4 files changed, 84 insertions(+), 175 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 df3cb3c2..8109fb89 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
@@ -1,57 +1,21 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="客户ID" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
-      </el-form-item>
-          <el-form-item label="所属组织ID" prop="orgId">
-          <el-input v-model="dataForm.orgId" placeholder="所属组织ID"></el-input>
-      </el-form-item>
-          <el-form-item label="所属组织名称" prop="orgName">
-          <el-input v-model="dataForm.orgName" placeholder="所属组织名称"></el-input>
-      </el-form-item>
-          <el-form-item label="组织ID上级" prop="pid">
-          <el-input v-model="dataForm.pid" placeholder="组织ID上级"></el-input>
-      </el-form-item>
-          <el-form-item label="组织ID所有上级" prop="pids">
-          <el-input v-model="dataForm.pids" placeholder="组织ID所有上级"></el-input>
-      </el-form-item>
-          <el-form-item label="核酸监测点名称" prop="name">
-          <el-input v-model="dataForm.name" placeholder="核酸监测点名称"></el-input>
-      </el-form-item>
-          <el-form-item label="服务时间" prop="serveTime">
-          <el-input v-model="dataForm.serveTime" placeholder="服务时间"></el-input>
-      </el-form-item>
-          <el-form-item label="咨询电话" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="咨询电话"></el-input>
-      </el-form-item>
-          <el-form-item label="监测点地址" prop="address">
-          <el-input v-model="dataForm.address" placeholder="监测点地址"></el-input>
-      </el-form-item>
-          <el-form-item label="经度" prop="longitude">
-          <el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
-      </el-form-item>
-          <el-form-item label="纬度" prop="latitude">
-          <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
-      </el-form-item>
-          <el-form-item label="" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder=""></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+        <el-form-item label="所属组织名称" prop="orgName">
+            <el-input v-model="dataForm.orgName" placeholder="所属组织名称"></el-input>
+        </el-form-item>
+        <el-form-item label="核酸监测点名称" prop="name">
+            <el-input v-model="dataForm.name" placeholder="核酸监测点名称"></el-input>
+        </el-form-item>
+        <el-form-item label="服务时间" prop="serveTime">
+            <el-input v-model="dataForm.serveTime" type="textarea" :rows="2" placeholder="请输入服务时间，如：每日开放 上午：8:00-11:30 ；下午：13:00-17:00"></el-input>
+        </el-form-item>
+        <el-form-item label="咨询电话" prop="mobile">
+            <el-input v-model="dataForm.mobile" placeholder="咨询电话" :change="check_num()"></el-input>
+        </el-form-item>
+        <el-form-item label="监测点地址" prop="address">
+            <el-input v-model="dataForm.address" placeholder="监测点地址"></el-input>
+        </el-form-item>
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -128,7 +92,7 @@
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/${moduleName}/${pathName}/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/epmetuser/icPointNucleicMonitoring/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -159,7 +123,11 @@
           })
         }).catch(() => {})
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { 'leading': true, 'trailing': false }),
+      //限制
+      check_num: function(){
+          this.dataForm.mobile = this.dataForm.mobile.replace(/[^\a-\z\A-\Z0-9]/g, '');
+      }
   }
 }
 </script>
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 8083ce67..f282c9f7 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -9,36 +9,23 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('user:icPointNucleicMonitoring:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('user:icPointNucleicMonitoring:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="customerId" label="客户ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="orgId" label="所属组织ID" header-align="center" align="center"></el-table-column>
         <el-table-column prop="orgName" label="所属组织名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pid" label="组织ID上级" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pids" label="组织ID所有上级" header-align="center" align="center"></el-table-column>
         <el-table-column prop="name" label="核酸监测点名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="serveTime" label="服务时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="咨询电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="address" label="监测点地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('user:icPointNucleicMonitoring:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('user:icPointNucleicMonitoring:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -59,7 +46,7 @@
 
 <script>
     import mixinViewModule from '@/mixins/view-module'
-    import AddOrUpdate from './'
+    import AddOrUpdate from './icpointnucleicmonitoring-add-or-update'
 
     export default {
   mixins: [mixinViewModule],
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 0b018e41..91379e9d 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -1,72 +1,36 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="客户ID" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
-      </el-form-item>
-          <el-form-item label="所属组织ID" prop="orgId">
-          <el-input v-model="dataForm.orgId" placeholder="所属组织ID"></el-input>
-      </el-form-item>
-          <el-form-item label="所属组织名称" prop="orgName">
-          <el-input v-model="dataForm.orgName" placeholder="所属组织名称"></el-input>
-      </el-form-item>
-          <el-form-item label="组织ID上级" prop="pid">
-          <el-input v-model="dataForm.pid" placeholder="组织ID上级"></el-input>
-      </el-form-item>
-          <el-form-item label="组织ID所有上级" prop="pids">
-          <el-input v-model="dataForm.pids" placeholder="组织ID所有上级"></el-input>
-      </el-form-item>
-          <el-form-item label="疫苗接种点名称" prop="name">
-          <el-input v-model="dataForm.name" placeholder="疫苗接种点名称"></el-input>
-      </el-form-item>
-          <el-form-item label="接种日期" prop="inoculationDate">
-          <el-input v-model="dataForm.inoculationDate" placeholder="接种日期"></el-input>
-      </el-form-item>
-          <el-form-item label="接种上午开始时间" prop="moStartTime">
-          <el-input v-model="dataForm.moStartTime" placeholder="接种上午开始时间"></el-input>
-      </el-form-item>
-          <el-form-item label="接种上午结束时间" prop="moEndTime">
-          <el-input v-model="dataForm.moEndTime" placeholder="接种上午结束时间"></el-input>
-      </el-form-item>
-          <el-form-item label="接种下午开始时间" prop="afStartTime">
-          <el-input v-model="dataForm.afStartTime" placeholder="接种下午开始时间"></el-input>
-      </el-form-item>
-          <el-form-item label="接种下午结束时间" prop="afEndTime">
-          <el-input v-model="dataForm.afEndTime" placeholder="接种下午结束时间"></el-input>
-      </el-form-item>
-          <el-form-item label="暂无疫苗（1：是；2：否）" prop="noAvailableVaccines">
-          <el-input v-model="dataForm.noAvailableVaccines" placeholder="暂无疫苗（1：是；2：否）"></el-input>
-      </el-form-item>
-          <el-form-item label="咨询电话" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="咨询电话"></el-input>
-      </el-form-item>
-          <el-form-item label="接种点地址" prop="address">
-          <el-input v-model="dataForm.address" placeholder="接种点地址"></el-input>
-      </el-form-item>
-          <el-form-item label="经度" prop="longitude">
-          <el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
-      </el-form-item>
-          <el-form-item label="纬度" prop="latitude">
-          <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
-      </el-form-item>
-          <el-form-item label="" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder=""></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+        <el-form-item label="所属组织名称" prop="orgName">
+            <el-input v-model="dataForm.orgName" placeholder="所属组织名称"></el-input>
+        </el-form-item>
+        <el-form-item label="疫苗接种点名称" prop="name">
+            <el-input v-model="dataForm.name" placeholder="疫苗接种点名称"></el-input>
+        </el-form-item>
+        <el-form-item label="接种日期" prop="inoculationDate">
+            <el-input v-model="dataForm.inoculationDate" placeholder="接种日期"></el-input>
+        </el-form-item>
+        <el-form-item label="接种上午开始时间" prop="moStartTime">
+            <el-input v-model="dataForm.moStartTime" placeholder="接种上午开始时间"></el-input>
+        </el-form-item>
+        <el-form-item label="接种上午结束时间" prop="moEndTime">
+            <el-input v-model="dataForm.moEndTime" placeholder="接种上午结束时间"></el-input>
+        </el-form-item>
+        <el-form-item label="接种下午开始时间" prop="afStartTime">
+            <el-input v-model="dataForm.afStartTime" placeholder="接种下午开始时间"></el-input>
+        </el-form-item>
+        <el-form-item label="接种下午结束时间" prop="afEndTime">
+            <el-input v-model="dataForm.afEndTime" placeholder="接种下午结束时间"></el-input>
+        </el-form-item>
+        <el-form-item label="" prop="noAvailableVaccines">
+            <el-checkbox v-model="dataForm.noAvailableVaccines" true-label="1" false-label="2">暂无疫苗</el-checkbox>
+        </el-form-item>
+        <el-form-item label="咨询电话" prop="mobile">
+            <el-input v-model="dataForm.mobile" placeholder="咨询电话"></el-input>
+        </el-form-item>
+        <el-form-item label="接种点地址" prop="address">
+            <el-input v-model="dataForm.address" placeholder="接种点地址"></el-input>
+        </el-form-item>
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -163,7 +127,7 @@
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/${moduleName}/${pathName}/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/epmetuser/icPointVaccinesInoculation/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -175,25 +139,26 @@
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/icPointVaccinesInoculation/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
+        console.log(this.dataForm)
+      // this.$refs['dataForm'].validate((valid) => {
+      //   if (!valid) {
+      //     return false
+      //   }
+      //   this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/icPointVaccinesInoculation/', this.dataForm).then(({ data: res }) => {
+      //     if (res.code !== 0) {
+      //       return this.$message.error(res.msg)
+      //     }
+      //     this.$message({
+      //       message: this.$t('prompt.success'),
+      //       type: 'success',
+      //       duration: 500,
+      //       onClose: () => {
+      //         this.visible = false
+      //         this.$emit('refreshDataList')
+      //       }
+      //     })
+      //   }).catch(() => {})
+      // })
     }, 1000, { 'leading': true, 'trailing': false })
   }
 }
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index dfaa2714..db0f563a 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -9,20 +9,15 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('user:icPointVaccinesInoculation:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('user:icPointVaccinesInoculation:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="customerId" label="客户ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="orgId" label="所属组织ID" header-align="center" align="center"></el-table-column>
         <el-table-column prop="orgName" label="所属组织名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pid" label="组织ID上级" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pids" label="组织ID所有上级" header-align="center" align="center"></el-table-column>
         <el-table-column prop="name" label="疫苗接种点名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="inoculationDate" label="接种日期" header-align="center" align="center"></el-table-column>
         <el-table-column prop="moStartTime" label="接种上午开始时间" header-align="center" align="center"></el-table-column>
@@ -34,16 +29,10 @@
         <el-table-column prop="address" label="接种点地址" header-align="center" align="center"></el-table-column>
         <el-table-column prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
         <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('user:icPointVaccinesInoculation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('user:icPointVaccinesInoculation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -64,7 +53,7 @@
 
 <script>
     import mixinViewModule from '@/mixins/view-module'
-    import AddOrUpdate from './'
+    import AddOrUpdate from './icpointvaccinesinoculation-add-or-update'
 
     export default {
   mixins: [mixinViewModule],