src/components/HelloWorld.vue

@@ -1,60 +0,0 @@
-<template>
-  <div class="hello">
-    <h1>{{ msg }}</h1>
-    <p>
-      For a guide and recipes on how to configure / customize this project,<br>
-      check out the
-      <a href="https://cli.vuejs.org" target="_blank" rel="noopener">vue-cli documentation</a>.
-    </p>
-    <h3>Installed CLI Plugins</h3>
-    <ul>
-      <li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-babel" target="_blank" rel="noopener">babel</a></li>
-      <li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-router" target="_blank" rel="noopener">router</a></li>
-      <li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-vuex" target="_blank" rel="noopener">vuex</a></li>
-      <li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint" target="_blank" rel="noopener">eslint</a></li>
-    </ul>
-    <h3>Essential Links</h3>
-    <ul>
-      <li><a href="https://vuejs.org" target="_blank" rel="noopener">Core Docs</a></li>
-      <li><a href="https://forum.vuejs.org" target="_blank" rel="noopener">Forum</a></li>
-      <li><a href="https://chat.vuejs.org" target="_blank" rel="noopener">Community Chat</a></li>
-      <li><a href="https://twitter.com/vuejs" target="_blank" rel="noopener">Twitter</a></li>
-      <li><a href="https://news.vuejs.org" target="_blank" rel="noopener">News</a></li>
-    </ul>
-    <h3>Ecosystem</h3>
-    <ul>
-      <li><a href="https://router.vuejs.org" target="_blank" rel="noopener">vue-router</a></li>
-      <li><a href="https://vuex.vuejs.org" target="_blank" rel="noopener">vuex</a></li>
-      <li><a href="https://github.com/vuejs/vue-devtools#vue-devtools" target="_blank" rel="noopener">vue-devtools</a></li>
-      <li><a href="https://vue-loader.vuejs.org" target="_blank" rel="noopener">vue-loader</a></li>
-      <li><a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">awesome-vue</a></li>
-    </ul>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'HelloWorld',
-  props: {
-    msg: String
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped lang="less">
-h3 {
-  margin: 40px 0 0;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: #42b983;
-}
-</style>

src/router/wokes.js

@@ -16,10 +16,10 @@ export default [
     path: '/frame/wokes/subject',
     component: () => import('../views/wokes/hospital/subject.vue')
   },
-  {
-    path: '/frame/wokes/specialist',
-    component: () => import('../views/wokes/hospital/specialist.vue')
-  },
+  // {
+  //   path: '/frame/wokes/specialist',
+  //   component: () => import('../views/wokes/hospital/specialist.vue')
+  // },
   {
     path: '/frame/wokes/order',
     component: () => import('../views/wokes/order.vue')

src/store/gaf/adminuser.js

@@ -18,7 +18,7 @@ const state = () => ({
 const actions = {
   async getUser ({ commit }, { filter, paging } = {}) {
     const { page = 1, size = 10 } = paging
-    const res = await axios.get(api.adminUser, { params: { skip: page - 1 < 0 ? 0 : page - 1, limit: size, ...filter } })
+    const res = await axios.get(api.adminUser, { params: { skip: page <= 1 ? 0 : (page - 1) * size, limit: size, ...filter } })
     if (res.errcode === 0) commit('adminUser', res)
     return res
   },

src/store/gaf/code.js

@@ -36,7 +36,7 @@ const actions = {
   },
   async codequery ({ commit }, { filter, paging, category } = {}) {
     const { page = 1, size = 10 } = paging
-    const res = await axios.get(`${api.codelist}${category}/list`, { params: { skip: page - 1 < 0 ? 0 : page - 1, limit: size, ...filter } })
+    const res = await axios.get(`${api.codelist}${category}/list`, { params: { skip: page <= 1 ? 0 : (page - 1) * size, limit: size, ...filter } })
     if (res.errcode === 0) commit('codelist', res)
     return res
   },

src/store/gaf/menu.js

@@ -49,14 +49,14 @@ export default [
     parentId: '2',
     module: '@wokes'
   },
-  {
-    title: '专家管理',
-    path: '/wokes/specialist',
-    id: '2-3',
-    icons: 'el-icon-user-solid',
-    parentId: '2',
-    module: '@wokes'
-  },
+  // {
+  //   title: '专家管理',
+  //   path: '/wokes/specialist',
+  //   id: '2-3',
+  //   icons: 'el-icon-user-solid',
+  //   parentId: '2',
+  //   module: '@wokes'
+  // },
   // 订单管理
   {
     title: '订单管理',

src/store/wokes/content.js

@@ -19,7 +19,7 @@ const state = () => ({
 const actions = {
   async contentquery ({ commit }, { filter, paging } = {}) {
     const { page = 1, size = 10 } = paging
-    const res = await axios.get(api.contentquery, { params: { skip: page - 1 < 0 ? 0 : page - 1, limit: size, ...filter } })
+    const res = await axios.get(api.contentquery, { params: { skip: page <= 1 ? 0 : (page - 1) * size, limit: size, ...filter } })
     if (res.errcode === 0) commit('content', res)
     return res
   },

src/store/wokes/hospital.js

@@ -19,7 +19,7 @@ const state = () => ({
 const actions = {
   async hospitalquery ({ commit }, { filter, paging } = {}) {
     const { page = 1, size = 10 } = paging
-    const res = await axios.get(api.hospitalquery, { params: { skip: page - 1 < 0 ? 0 : page - 1, limit: size, ...filter } })
+    const res = await axios.get(api.hospitalquery, { params: { skip: page <= 1 ? 0 : (page - 1) * size, limit: size, ...filter } })
     if (res.errcode === 0) commit('hospital', res)
     return res.data
   },

src/store/wokes/order.js

@@ -19,7 +19,7 @@ const state = () => ({
 const actions = {
   async orderquery ({ commit }, { filter = {}, paging = {} } = {}) {
     const { page = 1, size = 10 } = paging
-    const res = await axios.get(api.orderquery, { params: { skip: page - 1 < 0 ? 0 : page - 1, limit: size, ...filter } })
+    const res = await axios.get(api.orderquery, { params: { skip: page <= 1 ? 0 : (page - 1) * size, limit: size, ...filter } })
     if (res.errcode === 0) commit('order', res)
     return res
   },

src/store/wokes/pages.js

@@ -19,7 +19,7 @@ const state = () => ({
 const actions = {
   async pagequery ({ commit }, { filter = {}, paging = {} } = {}) {
     const { page = 1, size = 10 } = paging
-    const res = await axios.get(api.pagequery, { params: { skip: page - 1 < 0 ? 0 : page - 1, limit: size, ...filter } })
+    const res = await axios.get(api.pagequery, { params: { skip: page <= 1 ? 0 : (page - 1) * size, limit: size, ...filter } })
     if (res.errcode === 0) commit('page', res)
     return res
   },

src/store/wokes/specialist.js

@@ -19,7 +19,7 @@ const state = () => ({
 const actions = {
   async specialistquery ({ commit }, { filter, paging } = {}) {
     const { page = 1, size = 10 } = paging
-    const res = await axios.get(api.specialistquery, { params: { skip: page - 1 < 0 ? 0 : page - 1, limit: size, ...filter } })
+    const res = await axios.get(api.specialistquery, { params: { skip: page <= 1 ? 0 : (page - 1) * size, limit: size, ...filter } })
     if (res.errcode === 0) commit('specialist', res)
     return res
   },

src/store/wokes/subject.js

@@ -19,7 +19,9 @@ const state = () => ({
 const actions = {
   async subjectquery ({ commit }, { filter, paging } = {}) {
     const { page = 1, size = 10 } = paging
-    const res = await axios.get(api.subjectquery, { params: { skip: page - 1 < 0 ? 0 : page - 1, limit: size, ...filter } })
+    console.log(page, size)
+    const res = await axios.get(api.subjectquery, { params: { skip: page <= 1 ? 0 : (page - 1) * size, limit: size, ...filter } })
+    // const res = await axios.get(api.subjectquery, { params: { skip: 0, limit: 500, ...filter } })
     if (res.errcode === 0) commit('subject', res)
     return res
   },

src/views/gaf/code.vue

@@ -13,7 +13,7 @@
         <el-button style="float: right; padding: 3px 0" type="text" @click="addcode">添加字典</el-button>
       </div>
       <div class="main">
-        <naf-grid class="grid" ref="grid" :data="codeList" :meta="meta" @delete="codedel" @edit="edit" :total="total" @query="query"></naf-grid>
+        <naf-grid :search="false" class="grid" ref="grid"  :data="codeList" :meta="meta" @delete="codedel" @edit="edit" :total="total" @query="query"></naf-grid>
       </div>
     </el-card>
     <dialog-drawer type="dialog" :visible="visible" :title="isNew ? '修改' : '添加'" @close="close" :width="'30%'">
@@ -45,12 +45,12 @@ export default {
       is_data: {},
       visible: false,
       formmeta: [
-        { name: 'name', title: '名称', filter: true },
-        { name: 'code', title: '编码', filter: true }
+        { name: 'name', title: '名称' },
+        { name: 'code', title: '编码' }
       ],
       meta: [
-        { name: 'name', title: '名称', filter: true },
-        { name: 'code', title: '编码', filter: true }
+        { name: 'name', title: '名称' },
+        { name: 'code', title: '编码' }
       ],
       rules: {
         name: [

src/views/wokes/content/content.vue

@@ -79,22 +79,22 @@ export default {
       is_data: {},
       visible: false,
       meta: [
-        { name: 'title', title: '标题', filter: true },
-        { name: 'slug', title: '摘要' }
+        { name: 'title', title: '名称', filter: true },
+        { name: 'slug', title: '简介' }
       ],
       formmeta: [
         { name: 'thumbnail', title: '缩略图', slots: 'field' },
-        { name: 'title', title: '标题' },
+        { name: 'title', title: '名称' },
         { name: 'column', title: '绑定栏目', formatter: 'columns' },
-        { name: 'slug', title: '摘要' },
+        { name: 'slug', title: '简介' },
         { name: 'content', title: '内容', slots: 'field' }
       ],
       rules: {
         title: [
-          { required: true, message: '请输入标题', trigger: 'blur' }
+          { required: true, message: '请输入名称', trigger: 'blur' }
         ],
         slug: [
-          { required: true, message: '请输入摘要', trigger: 'blur' }
+          { required: true, message: '请输入简介', trigger: 'blur' }
         ],
         column: [
           { required: true, message: '请选择绑定栏目', trigger: 'blur' }

src/views/wokes/hospital/hospital.vue

@@ -8,7 +8,7 @@
       </div>
       <div class="main">
         <el-tree
-          :data="region"
+          :data="regionlist"
           default-expand-all
           :props="defaultProps"
           @node-click="treeClick"
@@ -70,7 +70,7 @@ export default {
   },
   data () {
     return {
-      region: null,
+      region: [],
       is_title: null,
       isClear: false,
       detail: '',
@@ -134,7 +134,7 @@ export default {
     // 添加
     async addhospital () {
       this.is_data = {
-        column: this.data.code
+        region: this.data.code
       }
       this.visible = true
     },
@@ -230,18 +230,21 @@ export default {
       // 获取字典
       this.region = await this.$dict('region')
       // eslint-disable-next-line eqeqeq
-      if (this.region && this.region.length > 0) {
-        this.is_title = this.region[0].name
-        this.$refs.deeptree.setCurrentKey(this.region[0].code)
-        this.data = this.region[0]
-        this.query()
-      }
+      // if (this.region && this.region.length > 0) {
+      //   this.is_title = this.region[0].name
+      //   this.$refs.deeptree.setCurrentKey(this.region[0].code)
+      //   this.data = this.region[0]
+      //   this.query()
+      // }
     }
   },
   computed: {
     ...mapState(['total', 'hospitalList', 'hospitalItem']),
     isNew () {
       return Boolean(this.is_data && this.is_data._id)
+    },
+    regionlist () {
+      return this.region.filter(e => e.code.length > 3)
     }
   }
 }

src/views/wokes/hospital/subject.vue

@@ -85,11 +85,8 @@ export default {
         { name: 'code', title: '科室编码' }
       ],
       formmeta: [
-        { name: 'thumbnail', title: '缩略图', slots: 'field' },
         { name: 'name', title: '科室名称' },
-        { name: 'code', title: '科室编码' },
-        // { name: 'hospitalId', title: '绑定医院', formatter: 'hospital' },
-        { name: 'content', title: '内容', slots: 'field' }
+        { name: 'code', title: '科室编码' }
       ],
       rules: {
         name: [
@@ -97,15 +94,6 @@ export default {
         ],
         code: [
           { required: true, message: '请输入科室编码', trigger: 'blur' }
-        ],
-        // hospitalId: [
-        //   { required: true, message: '请选择绑定医院', trigger: 'blur' }
-        // ],
-        thumbnail: [
-          { required: true, message: '请上传缩略图', trigger: 'blur' }
-        ],
-        content: [
-          { required: true, message: '请输入内容', trigger: 'blur' }
         ]
       },
       defaultProps: {
@@ -130,6 +118,7 @@ export default {
         hospitalId: this.data.code
       }
       this.visible = true
+      this.formmeta[1].disabled = false
     },
     // 删除
     async deletesubject (e) {
@@ -154,7 +143,7 @@ export default {
     },
     // 修改
     async edit (e) {
-      // await this.columnquery({ filter: {}, paging: {} })
+      this.formmeta[1].disabled = true
       await this.subjectdetails({ _id: e._id })
       this.is_data = { ...this.subjectItem }
       if (this.subjectItem.thumbnail) this.imageUrl = this.subjectItem.thumbnail
@@ -233,7 +222,7 @@ export default {
   },
   computed: {
     ...mapState(['total', 'subjectList', 'subjectItem']),
-    ...hospitalmapState(['total', 'hospitalList', 'hospitalItem']),
+    ...hospitalmapState(['hospitalList', 'hospitalItem']),
     isNew () {
       return Boolean(this.is_data && this.is_data._id)
     }

src/views/wokes/order.vue

@@ -2,8 +2,8 @@
   <div class="container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>单页管理</span>
-        <el-button style="float: right; padding: 3px 0" type="text" @click="addorder">添加单页</el-button>
+        <span>订单管理</span>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="addorder">添加订单</el-button>
       </div>
       <div class="main">
         <naf-grid ref="grid" @edit="edit" @delete="deleteorder" :data="orderList" :meta="meta" :total="total" @query="query"></naf-grid>
@@ -54,13 +54,9 @@ export default {
         { name: 'money', title: '金额' },
         { name: 'status', title: '付款状态', formatter: 'orderStatus' },
         { name: 'openid', title: 'openid' },
-        { name: 'code', title: '行政区编码' },
-        { name: 'hospitalId', title: '医院id' },
+        { name: 'code', title: '行政区编码', formatter: 'region' },
         { name: 'hospitalName', title: '医院名称' },
-        { name: 'subjectId', title: '科室id' },
         { name: 'subjectName', title: '科室名称' },
-        { name: 'specialistId', title: '专家id' },
-        { name: 'specialistName', title: '专家名称' },
         { name: 'remark', title: '备注' }
       ],
       rules: {
@@ -85,24 +81,12 @@ export default {
         code: [
           { required: true, message: '请输入行政区编码', trigger: 'blur' }
         ],
-        hospitalId: [
-          { required: true, message: '请输入医院id', trigger: 'blur' }
-        ],
         hospitalName: [
           { required: true, message: '请输入医院名称', trigger: 'blur' }
         ],
-        subjectId: [
-          { required: true, message: '请输入科室id', trigger: 'blur' }
-        ],
         subjectName: [
           { required: true, message: '请输入科室名称', trigger: 'blur' }
         ],
-        specialistId: [
-          { required: true, message: '请输入专家id', trigger: 'blur' }
-        ],
-        specialistName: [
-          { required: true, message: '请输入专家名称', trigger: 'blur' }
-        ],
         remark: [
           { required: false, message: '请输入备注', trigger: 'blur' }
         ]
@@ -175,6 +159,7 @@ export default {
   },
   async mounted () {
     const res = await this.init('orderStatus')
+    await this.init('region')
     if (res.errcode === 0) {
       this.query()
     }

vue.config.js

@@ -23,12 +23,12 @@ module.exports = {
       },
       '/api/': {
         // target: 'http://192.168.0.81:8001'
-        // target: 'http://192.168.4.1:7001'
-        target: 'http://127.0.0.1:18070'
+        target: 'http://127.0.0.1:9001'
+        // target: 'http://127.0.0.1:18070'
       },
       '/naf/': {
-        target: 'http://127.0.0.1:18070'
-        // target: 'http://192.168.4.1:7001'
+        // target: 'http://127.0.0.1:18070'
+        target: 'http://127.0.0.1:9002'
       },
       // 上传路径
       '/filesPath/': {