Merge branch 'master' of http://101.42.248.108:3000/wangyu/eitc-erm-pc

src/api/allApi.js

@@ -906,4 +906,11 @@ export function noticeManageDetails(params) {
     method: 'get',
     params
   })
-}
+}
+
+export function delClinict(id) {
+  return request({
+    url: `/sys/clinict/`+id,
+    method: 'delete'
+  })
+}

src/views/settingsPage/clinicMaintenance/addClinic.vue

@@ -2,29 +2,32 @@
   <div>
     <el-dialog :visible="onOpen" v-if="onOpen" @close="onClose" :title="pageType===1?`新增`:`编辑`">
       <el-row :gutter="15">
-        <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
+        <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
           <el-col :span="11">
             <el-form-item label="诊所名称" prop="clinicName">
               <el-input v-model="formData.clinicName" placeholder="请输入诊所名称" clearable
-                        :style="{width: '100%'}" :maxlength="64"></el-input>
+                        :style="{width: '100%'}" :maxlength="64"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="服务IP" prop="clinicIp">
-              <el-input v-model="formData.clinicIp" placeholder="请输入服务IP" clearable :style="{width: '100%'}">
+            <el-form-item label="IP地址" prop="clinicIp">
+              <el-input v-model="formData.clinicIp" placeholder="请输入IP地址" clearable :style="{width: '100%'}">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="服务用户" prop="serverUser">
-              <el-input v-model="formData.serverUser" placeholder="请输入服务用户" clearable
-                        :style="{width: '100%'}"></el-input>
+            <el-form-item label="服务器登录名" prop="serverUser">
+              <el-input v-model="formData.serverUser" placeholder="请输入服务器登录名" clearable
+                        :style="{width: '100%'}"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="服务密码" prop="serverPassword">
-              <el-input v-model="formData.serverPassword" placeholder="请输入服务密码" clearable
-                        :style="{width: '100%'}"></el-input>
+            <el-form-item label="服务器密码" prop="serverPassword">
+              <el-input v-model="formData.serverPassword" placeholder="请输入服务器密码" clearable
+                        :style="{width: '100%'}"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11">
@@ -34,21 +37,26 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="创建时间" prop="creatTime">
+            <el-form-item label="购买时间" prop="creatTime">
               <el-date-picker v-model="formData.creatTime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                              :style="{width: '100%'}" placeholder="请输入创建时间" clearable></el-date-picker>
+                              :style="{width: '100%'}" placeholder="请选择购买时间" clearable
+                              :picker-options="pickerStartOptions"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="11">
             <el-form-item label="到期时间" prop="expireTime">
               <el-date-picker v-model="formData.expireTime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                              :style="{width: '100%'}" placeholder="请选择时间选择" clearable></el-date-picker>
+                              :style="{width: '100%'}" placeholder="请选择到期时间" clearable
+                              :picker-options="pickerEndOptions"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="版本信息" prop="versionInfo">
-              <el-input v-model="formData.versionInfo" placeholder="请输入版本信息" clearable
-                        :style="{width: '100%'}"></el-input>
+            <el-form-item label="版本编号" prop="versionInfo">
+              <el-input v-model="formData.versionInfo" placeholder="请输入版本编号" clearable
+                        :style="{width: '100%'}"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11">
@@ -58,8 +66,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="绑定手机" prop="phone">
-              <el-input v-model="formData.phone" placeholder="请输入绑定手机" clearable :style="{width: '100%'}">
+            <el-form-item label="手机号" prop="phone">
+              <el-input v-model="formData.phone" placeholder="请输入手机号" clearable :style="{width: '100%'}">
               </el-input>
             </el-form-item>
           </el-col>
@@ -70,11 +78,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="版本描述" prop="versionRefer">
-              <el-select v-model="formData.versionRefer" placeholder="请选择版本描述" clearable
-                         :style="{width: '100%'}">
+            <el-form-item label="购买版本" prop="versionRefer">
+              <el-select v-model="formData.versionRefer" placeholder="请选择购买版本" clearable
+                         :style="{width: '100%'}"
+              >
                 <el-option v-for="(item, index) in mobileOptions" :key="index" :label="item.label"
-                           :value="item.value" :disabled="item.disabled"></el-option>
+                           :value="item.value" :disabled="item.disabled"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -88,7 +98,7 @@
   </div>
 </template>
 <script>
-import {addClinict, editClinict} from '@/api/allApi.js'
+import { addClinict, editClinict } from '@/api/allApi.js'
 
 export default {
   components: {},
@@ -116,23 +126,38 @@ export default {
         region: ``,
         phone: ``,
         address: ``,
-        versionRefer: ``,
+        versionRefer: ``
+      },
+      pickerStartOptions: {
+        disabledDate: (time) => {
+
+          if (this.formData.expireTime !== null) {
+            return time.getTime() > new Date(this.formData.expireTime).getTime()
+          }
+        }
+      },
+      pickerEndOptions: {
+        disabledDate: (time) => {
+          if (this.formData.creatTime !== null){
+            return time.getTime() < new Date(this.formData.creatTime).getTime()
+          }
+        }
       },
       mobileOptions: [{
-        "label": "免费版",
-        "value": "免费版"
-      },{
-        "label": "基础版",
-        "value": "基础版"
+        'label': '免费版',
+        'value': '免费版'
       }, {
-        "label": "高级版",
-        "value": "高级版"
+        'label': '基础版',
+        'value': '基础版'
       }, {
-        "label": "豪华版",
-        "value": "豪华版"
+        'label': '高级版',
+        'value': '高级版'
       }, {
-        "label": "尊贵版",
-        "value": "尊贵版"
+        'label': '豪华版',
+        'value': '豪华版'
+      }, {
+        'label': '尊贵版',
+        'value': '尊贵版'
       }],
       rules: {
         clinicName: [{
@@ -142,21 +167,21 @@ export default {
         }],
         clinicIp: [{
           required: true,
-          message: '请输入服务IP',
+          message: '请输入IP地址',
           trigger: 'blur'
         }, {
           pattern: /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?).){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/,
-          message: '服务IP格式错误',
+          message: 'IP地址格式错误',
           trigger: 'blur'
         }],
         serverUser: [{
           required: true,
-          message: '请输入服务用户',
+          message: '请输入服务器登录名',
           trigger: 'blur'
         }],
         serverPassword: [{
           required: true,
-          message: '请输入服务密码',
+          message: '请输入服务器密码',
           trigger: 'blur'
         }],
         realmName: [{
@@ -166,17 +191,17 @@ export default {
         }],
         creatTime: [{
           required: true,
-          message: '请输入创建时间',
+          message: '请选择购买时间',
           trigger: 'change'
         }],
         expireTime: [{
           required: true,
-          message: '请选择时间选择',
+          message: '请选择到期时间',
           trigger: 'change'
         }],
         versionInfo: [{
           required: true,
-          message: '请输入版本信息',
+          message: '请输入版本编号',
           trigger: 'blur'
         }],
         region: [{
@@ -186,7 +211,7 @@ export default {
         }],
         phone: [{
           required: true,
-          message: '请输入绑定手机',
+          message: '请输入手机号',
           trigger: 'blur'
         }, {
           pattern: /^1(3|4|5|7|8|9)\d{9}$/,
@@ -200,19 +225,24 @@ export default {
         }],
         versionRefer: [{
           required: true,
-          message: '请输入版本描述',
+          message: '请选择购买版本',
           trigger: 'blur'
-        }],
-      },
+        }]
+      }
     }
   },
-  computed: {},
-  watch: {},
+  computed:
+      {}
+  ,
+  watch: {}
+  ,
   created() {
-  },
+  }
+  ,
   mounted() {
 
-  },
+  }
+  ,
   methods: {
     onClose() {
       this.$emit('closeDialog')
@@ -220,39 +250,50 @@ export default {
         creatTime: null,
         expireTime: null
       }
-    },
-    async handleConfirm() {
-      /**
-       * 新增
-       */
-      if (this.pageType === 1) {
-        const res = await addClinict(this.formData)
-        if (res.code === 200) {
-          this.$emit('closeDialog')
-          this.$emit('initList')
-          this.$message.success('保存成功')
-        } else {
-          this.$message.error(res.msg)
-        }
-      } else {
-        /**
-         * 编辑
-         */
-        console.log(this.formData)
-        const res = await editClinict(this.formData)
-        if (res.code === 200) {
-          this.$emit('initList')
-          this.$emit('closeDialog')
-          this.$message.success('保存成功')
-          this.formData = {
-            creatTime: null,
-            expireTime: null
+    }
+    ,
+    handleConfirm() {
+
+      this.$refs.elForm.validate(async(valid) => {
+        if (valid) {
+          /**
+           * 新增
+           */
+          if (this.pageType === 1) {
+            const res = await addClinict(this.formData)
+            if (res.code === 200) {
+              this.$emit('closeDialog')
+              this.$emit('initList')
+              this.$message.success('保存成功')
+            } else {
+              this.$message.error(res.msg)
+            }
+          } else {
+            /**
+             * 编辑
+             */
+            console.log(this.formData)
+            const res = await editClinict(this.formData)
+            if (res.code === 200) {
+              this.$emit('initList')
+              this.$emit('closeDialog')
+              this.$message.success('保存成功')
+              this.formData = {
+                creatTime: null,
+                expireTime: null
+              }
+            } else {
+              this.$message.error(res.msg)
+            }
           }
         } else {
-          this.$message.error(res.msg)
+          console.log('error submit!!')
+          return false
         }
-      }
-    },
+      })
+
+    }
+
   }
 }
 

src/views/settingsPage/clinicMaintenance/index.vue

@@ -24,36 +24,36 @@
     </el-row>
 
     <el-table :data="tableData" style="width: 100%">
-      <el-table-column prop="clinicCode" label="诊所编号" align="center">
+      <el-table-column prop="clinicCode" label="诊所编号" align="center" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="clinicName" label="诊所名称" align="center">
+      <el-table-column prop="clinicName" label="诊所名称" align="center" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="clinicIp" label="IP地址" align="center">
+      <el-table-column prop="clinicIp" label="IP地址" align="center" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="phone" label="手机号" align="center">
+      <el-table-column prop="phone" label="手机号" align="center" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="serverUser" label="服务器登录名" align="center">
+      <el-table-column prop="serverUser" label="服务器登录名" align="center" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="serverPassword" label="服务器密码" align="center">
+      <el-table-column prop="serverPassword" label="服务器密码" align="center" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="versionInfo" label="服务器版本编号" align="center">
+      <el-table-column prop="versionInfo" label="版本编号" align="center" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="versionRefer" label="购买版本" align="center">
+      <el-table-column prop="versionRefer" label="购买版本" align="center" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="creatTime" label="购买时间" align="center" width="170px">
+      <el-table-column prop="creatTime" label="购买时间" align="center" width="150px" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="expireTime" label="到期时间" align="center" width="170px">
+      <el-table-column prop="expireTime" label="到期时间" align="center" width="150px" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column prop="isExpire" label="是否到期" align="center" width="170px">
+      <el-table-column prop="isExpire" label="是否到期" align="center" width="150px" show-overflow-tooltip>
         <template slot-scope="scope">
           <p v-if="scope.row.isExpire > 30 "  style="color: green"> 剩余天数({{scope.row.isExpire}}) </p>
           <p v-else-if="scope.row.isExpire > 1 && scope.row.isExpire < 31"  style="color: orange"> 剩余天数({{scope.row.isExpire}}) </p>
           <span v-else style="color: red">已到期</span>
         </template>
       </el-table-column>
-      <el-table-column prop="address" label="地址" align="center">
+      <el-table-column prop="address" label="地址" align="center" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column fixed="right" label="操作" align="center">
+      <el-table-column fixed="right" label="操作" align="center" width="150">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="upgrade(scope.row)">升级</el-button>
           <el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button>
@@ -91,6 +91,8 @@
 import {clinictList,delClinict} from '@/api/allApi.js'
 import addClinic from "./addClinic.vue";
 import upgrade from "./upgrade.vue";
+// 分页组件
+import Pagination from "@/components/Pagination";
 
 export default {
   name: 'EitcErmPcIndex',
@@ -130,7 +132,7 @@ export default {
     edit(val) {
       this.onOpen = true;
       this.pageType = 2;
-      this.$refs.addClinicRef.formData = val;
+      this.$refs.addClinicRef.formData = { ...val };
     },
     /**
      * 新增
@@ -149,23 +151,28 @@ export default {
       console.log(val)
     },
     async initList() {
-      let obj = {}
+      let obj = {pageNum: this.form.pageNum,pageSize: this.form.pageSize}
       if (this.clinicName.length>0){
         obj = {clinicName: this.clinicName}
       }
       const res = await clinictList(obj)
-      this.tableData = res.rows;
-      this.tableData.forEach(x=>{
-        const today = new Date();
-        let endTime = new Date(Date.parse(x.expireTime.replace(/-/g, "/"))).getTime();
-        x.isExpire =Math.ceil(Math.abs((today - endTime)) / (1000 * 60 * 60 * 24));
-      })
+      if (res.code === 200){
+        this.total = res.total;
+        this.tableData = res.rows;
+        this.tableData.forEach(x=>{
+          const today = new Date();
+          let endTime = new Date(Date.parse(x.expireTime.replace(/-/g, "/"))).getTime();
+          x.isExpire =Math.ceil(Math.abs((today - endTime)) / (1000 * 60 * 60 * 24));
+        })
+        this.loading = false;
+      }
     },
     /**
      * 重置
      */
     reset() {
       this.clinicName = ''
+      this.initList('')
     },
     /**
      * 关闭弹窗
@@ -178,7 +185,7 @@ export default {
      * 删除
      */
     deleteData(id) {
-      this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+      this.$confirm('此操作将永久删除该项, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/settingsPage/clinicMaintenance/upgrade.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog :visible="upgradeOpen" @close="onClose" title="升级">
+    <el-dialog :visible="upgradeOpen" v-if="upgradeOpen"   @close="onClose" title="升级">
       <el-row :gutter="15">
         <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
 
@@ -68,7 +68,7 @@ export default {
         }],
         vcode: [{
           required: true,
-          message: '请输入升级版本',
+          message: '请输入校验码',
           trigger: 'blur'
         }]
       },
@@ -94,16 +94,21 @@ export default {
     },
     async handleConfirm() {
       console.log(this.formData)
-      const res = await editClinict(this.formData)
-      if (res.code === 200) {
-        this.$emit('initList')
-        this.$emit('closeDialog')
-        this.$message.success('保存成功')
-        this.formData = {}
-      } else {
-        this.$message.error(res.msg)
-        this.$emit('closeDialog')
-      }
+      this.$refs.elForm.validate(async(valid) => {
+        if (valid) {
+          const res = await editClinict(this.formData)
+          if (res.code === 200) {
+            this.$emit('initList')
+            this.$emit('closeDialog')
+            this.$message.success('保存成功')
+            this.formData = {}
+          } else {
+            this.$message.error(res.msg)
+            this.$emit('closeDialog')
+          }
+        }
+      })
+
     },
     field102BeforeUpload(file) {
       let isRightSize = file.size / 1024 / 1024 < 2