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

src/api/allApi.js

@@ -841,6 +841,27 @@ export function operationsAnalysisList(params) {
     params
   })
 }
+export function clinictList(params) {
+  return request({
+    url: `/sys/clinict/list`,
+    method: 'get',
+    params
+  })
+}
+export function addClinict(data) {
+  return request({
+    url: `/sys/clinict/add`,
+    method: 'post',
+    data
+  })
+}
+export function editClinict(data) {
+  return request({
+    url: `/sys/clinict/edit`,
+    method: 'put',
+    data
+  })
+}
 
 export function noticeManageList(params) {
   return request({

src/views/settingsPage/clinicMaintenance/addClinic.vue

@@ -0,0 +1,261 @@
+<template>
+  <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-col :span="11">
+            <el-form-item label="诊所名称" prop="clinicName">
+              <el-input v-model="formData.clinicName" placeholder="请输入诊所名称" clearable
+                        :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-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>
+          </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>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="诊所域名" prop="realmName">
+              <el-input v-model="formData.realmName" placeholder="请输入诊所域名" clearable :style="{width: '100%'}">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <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>
+            </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>
+            </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>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="所在地区" prop="region">
+              <el-input v-model="formData.region" placeholder="请输入所在地区" clearable :style="{width: '100%'}">
+              </el-input>
+            </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-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="详细地址" prop="address">
+              <el-input v-model="formData.address" placeholder="请输入详细地址" clearable :style="{width: '100%'}">
+              </el-input>
+            </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-option v-for="(item, index) in mobileOptions" :key="index" :label="item.label"
+                           :value="item.value" :disabled="item.disabled"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div slot="footer">
+        <el-button @click="onClose">取消</el-button>
+        <el-button type="primary" @click="handleConfirm">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {addClinict, editClinict} from '@/api/allApi.js'
+
+export default {
+  components: {},
+  props: {
+    onOpen: {
+      type: Boolean,
+      default: false
+    },
+    pageType: {
+      type: Number,
+      default: 1
+    }
+  },
+  data() {
+    return {
+      formData: {
+        clinicName: ``,
+        clinicIp: ``,
+        serverUser: ``,
+        serverPassword: ``,
+        realmName: ``,
+        creatTime: null,
+        expireTime: null,
+        versionInfo: ``,
+        region: ``,
+        phone: ``,
+        address: ``,
+        versionRefer: ``,
+      },
+      mobileOptions: [{
+        "label": "免费版",
+        "value": "免费版"
+      },{
+        "label": "基础版",
+        "value": "基础版"
+      }, {
+        "label": "高级版",
+        "value": "高级版"
+      }, {
+        "label": "豪华版",
+        "value": "豪华版"
+      }, {
+        "label": "尊贵版",
+        "value": "尊贵版"
+      }],
+      rules: {
+        clinicName: [{
+          required: true,
+          message: '请输入诊所名称',
+          trigger: 'blur'
+        }],
+        clinicIp: [{
+          required: true,
+          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格式错误',
+          trigger: 'blur'
+        }],
+        serverUser: [{
+          required: true,
+          message: '请输入服务用户',
+          trigger: 'blur'
+        }],
+        serverPassword: [{
+          required: true,
+          message: '请输入服务密码',
+          trigger: 'blur'
+        }],
+        realmName: [{
+          required: true,
+          message: '请输入诊所域名',
+          trigger: 'blur'
+        }],
+        creatTime: [{
+          required: true,
+          message: '请输入创建时间',
+          trigger: 'change'
+        }],
+        expireTime: [{
+          required: true,
+          message: '请选择时间选择',
+          trigger: 'change'
+        }],
+        versionInfo: [{
+          required: true,
+          message: '请输入版本信息',
+          trigger: 'blur'
+        }],
+        region: [{
+          required: true,
+          message: '请输入所在地区',
+          trigger: 'blur'
+        }],
+        phone: [{
+          required: true,
+          message: '请输入绑定手机',
+          trigger: 'blur'
+        }, {
+          pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+          message: '手机号格式错误',
+          trigger: 'blur'
+        }],
+        address: [{
+          required: true,
+          message: '请输入详细地址',
+          trigger: 'blur'
+        }],
+        versionRefer: [{
+          required: true,
+          message: '请输入版本描述',
+          trigger: 'blur'
+        }],
+      },
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
+  },
+  mounted() {
+
+  },
+  methods: {
+    onClose() {
+      this.$emit('closeDialog')
+      this.formData = {
+        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
+          }
+        } else {
+          this.$message.error(res.msg)
+        }
+      }
+    },
+  }
+}
+
+</script>
+<style>
+</style>

src/views/settingsPage/clinicMaintenance/index.vue

@@ -1,94 +1,204 @@
 <template>
   <div class="app-container">
     <el-form :inline="true">
-      <el-form-item label="姓名：">
+      <el-form-item label="诊所名称：">
         <el-input
-          v-model="form.doctorName"
-          placeholder="请输入姓名查找"
+            v-model="clinicName"
+            placeholder="请输入诊所名称查找"
         ></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="initList" icon="el-icon-search"
-          >搜索</el-button
+        >搜索
+        </el-button
         >
         <el-button @click="reset">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row style="margin-bottom: 20px;">
-      <el-button type="primary" plain icon="el-icon-plus" size="mini"
-        >新增</el-button
+      <el-button type="primary" plain icon="el-icon-plus" size="mini"  @click="add()"
+      >新增
+      </el-button
       >
     </el-row>
 
     <el-table :data="tableData" style="width: 100%">
-      <el-table-column prop="date" label="日期" align="center">
+      <el-table-column prop="clinicCode" label="诊所编号" align="center">
       </el-table-column>
-      <el-table-column prop="name" label="姓名" align="center">
+      <el-table-column prop="clinicName" label="诊所名称" align="center">
+      </el-table-column>
+      <el-table-column prop="clinicIp" label="IP地址" align="center">
+      </el-table-column>
+      <el-table-column prop="phone" label="手机号" align="center">
+      </el-table-column>
+      <el-table-column prop="serverUser" label="服务器登录名" align="center">
+      </el-table-column>
+      <el-table-column prop="serverPassword" label="服务器密码" align="center">
+      </el-table-column>
+      <el-table-column prop="versionInfo" label="服务器版本编号" align="center">
+      </el-table-column>
+      <el-table-column prop="versionRefer" label="购买版本" align="center">
+      </el-table-column>
+      <el-table-column prop="creatTime" label="购买时间" align="center" width="170px">
+      </el-table-column>
+      <el-table-column prop="expireTime" label="到期时间" align="center" width="170px">
+      </el-table-column>
+      <el-table-column prop="isExpire" label="是否到期" align="center" width="170px">
+        <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>
       <el-table-column fixed="right" label="操作" align="center">
         <template slot-scope="scope">
-          <el-button type="text" size="small">编辑</el-button>
-          <el-button type="text" size="small" style="color: red"
-            >删除</el-button
-          >
+          <el-button type="text" size="small" @click="upgrade(scope.row)">升级</el-button>
+          <el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button>
+          <el-button type="text" size="small" style="color: red" @click="deleteData(scope.row.id)">删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="form.pageNum"
-      :limit.sync="form.pageSize"
-      @pagination="initList"
+        v-show="total > 0"
+        :total="total"
+        :page.sync="form.pageNum"
+        :limit.sync="form.pageSize"
+        @pagination="initList"
+    />
+    <addClinic
+        :onOpen="onOpen"
+        :title="title"
+        :pageType="pageType"
+        :dictType="dictType"
+        ref="addClinicRef"
+        @closeDialog="closeDialog"
+    />
+    <upgrade
+        :upgradeOpen="upgradeOpen"
+        :title="title"
+        ref="upgradeOpenRef"
+        @closeDialog="closeDialog"
     />
   </div>
 </template>
 
 <script>
+import {clinictList,delClinict} from '@/api/allApi.js'
+import addClinic from "./addClinic.vue";
+import upgrade from "./upgrade.vue";
+
 export default {
   name: 'EitcErmPcIndex',
-
+  computed: {
+  },
+  components: {
+    upgrade,
+    addClinic
+  },
   data() {
     return {
+      onOpen: false,
+      upgradeOpen: false,
+      title: ``,
+      dictType: ``,
       form: {
         pageNum: 1,
         pageSize: 10
       },
-      tableData: [
-        {
-          date: '2016-05-02',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        },
-        {
-          date: '2016-05-04',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1517 弄'
-        },
-        {
-          date: '2016-05-01',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1519 弄'
-        },
-        {
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1516 弄'
-        }
-      ],
-      total: 0
+      clinicName: '',
+      data: {},
+      editData: {},
+      tableData: [],
+      total: 0,
+      pageType: 1,
     }
   },
 
-  mounted() {},
+  mounted() {
+    this.initList('')
+  },
 
   methods: {
-    initList() {},
-    reset() {}
+    /**
+     * 编辑
+     */
+    edit(val) {
+      this.onOpen = true;
+      this.pageType = 2;
+      this.$refs.addClinicRef.formData = val;
+    },
+    /**
+     * 新增
+     */
+    add(){
+      this.onOpen = true;
+      this.pageType = 1;
+    },
+    /**
+     * 升级页面
+     */
+    upgrade(val){
+      this.upgradeOpen = true;
+      val.versionInfoOld = val.versionInfo
+      this.$refs.upgradeOpenRef.formData = val;
+      console.log(val)
+    },
+    async initList() {
+      let obj = {}
+      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));
+      })
+    },
+    /**
+     * 重置
+     */
+    reset() {
+      this.clinicName = ''
+    },
+    /**
+     * 关闭弹窗
+     */
+    closeDialog(){
+      this.onOpen = false;
+      this.upgradeOpen = false;
+    },
+    /**
+     * 删除
+     */
+    deleteData(id) {
+      this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        delClinict(id).then(res => {
+          if (res.code !== 200) return this.$message.error(res.msg);
+          this.initList()
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          });
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+
+    }
   }
 }
-</script>
+</script>

src/views/settingsPage/clinicMaintenance/upgrade.vue

@@ -0,0 +1,124 @@
+<template>
+  <div>
+    <el-dialog :visible="upgradeOpen" @close="onClose" title="升级">
+      <el-row :gutter="15">
+        <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
+
+          <el-col :span="12">
+            <el-form-item label="现在版本" prop="versionInfoOld">
+              <el-input v-model="formData.versionInfoOld" placeholder="请输入现在版本" readonly :disabled='true' clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="升级版本" prop="versionInfo">
+              <el-input v-model="formData.versionInfo" placeholder="请输入升级版本" :maxlength="64" clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="上传升级包" prop="field102" required>-->
+<!--              <el-upload ref="field102" :file-list="field102fileList" :action="field102Action"-->
+<!--                         :before-upload="field102BeforeUpload">-->
+<!--                <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>-->
+<!--              </el-upload>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+          <el-col :span="12">
+            <el-form-item label="校验码" prop="vcode">
+              <el-input v-model="formData.vcode" placeholder="请输入校验码" clearable
+                        :style="{width: '100%'}"></el-input>
+            </el-form-item>
+<!--          </el-col>-->
+<!--          <el-col :span="4">-->
+<!--            <el-form-item label-width="16px" label="" prop="field105">-->
+<!--              <el-button type="primary" size="medium"> 获取校验码 </el-button>-->
+<!--            </el-form-item>-->
+          </el-col>
+        </el-form>
+      </el-row>
+      <div slot="footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="handleConfirm">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {editClinict} from '@/api/allApi.js'
+
+export default {
+  inheritAttrs: false,
+  components: {},
+  props: {
+    upgradeOpen: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      formData: {
+      },
+      rules: {
+        versionInfo: [{
+          required: true,
+          message: '请输入升级版本',
+          trigger: 'blur'
+        }],
+        vcode: [{
+          required: true,
+          message: '请输入升级版本',
+          trigger: 'blur'
+        }]
+      },
+      field102Action: 'https://jsonplaceholder.typicode.com/posts/',
+      field102fileList: [],
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
+
+  },
+  mounted() {
+
+
+  },
+  methods: {
+    onClose() {
+      this.$emit('closeDialog')
+    },
+    close() {
+      this.$emit('closeDialog')
+    },
+    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')
+      }
+    },
+    field102BeforeUpload(file) {
+      let isRightSize = file.size / 1024 / 1024 < 2
+      if (!isRightSize) {
+        this.$message.error('文件大小超过 2MB')
+      }
+      return isRightSize
+    },
+  }
+}
+
+</script>
+<style>
+.el-upload__tip {
+  line-height: 1.2;
+}
+
+</style>