Browse Source
Squashed commit of the following:
commit 90c19d9b55d3594eb4d704fd87b2dcaf36416707
Author: liucf <liucf@zjlantone.com>
Date: Tue Aug 6 11:28:45 2019 +0800
bug1920
commit fa17fca3dbf6319d7ffcc5f0e77607be54352833
Author: liucf <liucf@zjlantone.com>
Date: Tue Aug 6 10:57:44 2019 +0800
bug1969
commit 43da3d865e869252e7b91d50645501de5421f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Aug 5 17:44:07 2019 +0800
ios输入框聚焦不跳转
Squashed commit of the following:
commit 97ee034f9410dd499167b19a413e8e510d4cd049
Author: liucf <liucf@zjlantone.com>
Date: Mon Aug 5 15:35:46 2019 +0800
Squashed commit of the following:
commit 5014effc6ac19096716a467dc19c52edac3a631e
Author: liucf <liucf@zjlantone.com>
Date: Mon Aug 5 14:33:16 2019 +0800
Squashed commit of the following:
commit 0b1b12d0a1b7348293e9885aa2ba50a95f456ac2
Merge: 8e2d286 e6b6aa7
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 11:07:52 2019 +0800
Merge branch 'dev' into byll
commit e6b6aa7427e3b8d3220d96b960cc78fd4dadcb1f
Merge: b37ccb4 655abe4
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 10:59:18 2019 +0800
Merge branch 'dev' of http://192.168.2.236:10080/zhouna/preliminary into dev
commit 8e2d2868688f6a57ae4eae38153052e95d8baff5
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 10:58:36 2019 +0800
错误处理
commit 5924cb1cfc6ed3637926321c5bc04c05b8574bd9
Merge: 9d5ed16 b37ccb4
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 09:43:40 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# build/webpack.dev.conf.js
# src/store.js
commit b37ccb44dd5edad05538537f46a180c9eb864c4a
Merge: 7f32ba5 708cae3
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 09:36:08 2019 +0800
Merge branch 'dev' of http://192.168.2.236:10080/zhouna/preliminary into dev
commit 9d5ed165f7fdef257e00cacbab92dc14617dd997
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 09:35:21 2019 +0800
改下预览模块位置顺序
commit 682c8695a1543b7a5af7fe45d5c057032363b272
Author: Luolei1992 <16657115156@163.com>
Date: Thu Aug 1 17:26:14 2019 +0800
bugfix
commit 7f32ba51b316ef463b7487c03c3b8ee032e89897
Author: Luolei1992 <16657115156@163.com>
Date: Thu Aug 1 16:33:42 2019 +0800
11
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 5c9fad31def62948c95d8700ba95d6d92c179d95
Author: liucf <liucf@zjlantone.com>
Date: Mon Aug 5 14:02:15 2019 +0800
明细页增加多列填写
commit 655abe42cfdcf59f0d5f30bc8f706e257aea0c70
Author: liucf <liucf@zjlantone.com>
Date: Mon Aug 5 10:38:14 2019 +0800
患者端医生端存值
commit 708cae348c2d276ec6d04a673ba1d621793b1b74
Author: liucf <liucf@zjlantone.com>
Date: Fri Aug 2 15:34:50 2019 +0800
选项输入框修改
commit 1bfc760b18970c4b79d3422918d7d13f05ffe78f
Author: liucf <liucf@zjlantone.com>
Date: Fri Aug 2 14:09:56 2019 +0800
暂存
commit 6d5bc3a7cc5abd99045ab54276d642c75eaf616c
Author: liucf <liucf@zjlantone.com>
Date: Fri Aug 2 13:15:35 2019 +0800
Squashed commit of the following:
commit f25eb2ba002cb147d21773b5c1cf7bb030366971
Author: liucf <liucf@zjlantone.com>
Date: Fri Aug 2 10:23:38 2019 +0800
Squashed commit of the following:
commit dfcb93f3267ded88365e77dd0f6ac50001e64eca
Author: liucf <liucf@zjlantone.com>
Date: Fri Aug 2 09:43:00 2019 +0800
安卓手机详情输入框问题；图片居中及一些细节修改
commit 24ddb2780a68e0fc9aced7595c78aeea2039347c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 11:45:05 2019 +0800
隐藏儿童体质检测并居中
commit acc866d184ae50ef63d162752250bea94327a44d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 10:07:24 2019 +0800
合并test分支
Squashed commit of the following:
commit 196289f93d75ad97281e9c44ba45b8c0d43e111e
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:34:07 2019 +0800
Squashed commit of the following:
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/common/Label.vue
# src/common/UploadImg.vue
# src/components/AddContent.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/PathInfo.vue
# src/components/Preview.vue
# src/components/Search.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/less/base.less
# src/less/index.less
# src/utils/tools.js
commit 2e166e9b6684fb6d3b9f14881d24dd5e3e215b31
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 20:21:46 2019 +0800
移除app.js文件
commit ebd1b3c534d93265e59e85dde2b705c050224c4e
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:02:41 2019 +0800
Squashed commit of the following:
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/components/AddContent.vue
commit 387b29eb6eaeb507b1fc03aeecad829012ce8df0
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:55:47 2019 +0800
Squashed commit of the following:
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/common/Label.vue
# src/components/DetailBox.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/Preview.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/utils/tools.js
commit 8f7c125f02a869ee541e89311ef4e662fe227ecd
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:29:21 2019 +0800
Squashed commit of the following:
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/store.js
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# package.json
# src/common/Input.vue
# src/common/OptionInp.vue
# src/common/UploadImg.vue
# src/components/AddContent.vue
# src/components/Detail.vue
# src/components/DetailBox.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/PathInfo.vue
# src/components/Symptom.vue
# src/less/base.less
# src/utils/tools.js
commit 904097d830c4fccce478fcf26b8fe36e4f3dd671
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 12:19:09 2019 +0800
Squashed commit of the following:
commit 24ddb2780a68e0fc9aced7595c78aeea2039347c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 11:45:05 2019 +0800
隐藏儿童体质检测并居中
commit acc866d184ae50ef63d162752250bea94327a44d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 10:07:24 2019 +0800
合并test分支
Squashed commit of the following:
commit 196289f93d75ad97281e9c44ba45b8c0d43e111e
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:34:07 2019 +0800
Squashed commit of the following:
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/common/Label.vue
# src/common/UploadImg.vue
# src/components/AddContent.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/PathInfo.vue
# src/components/Preview.vue
# src/components/Search.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/less/base.less
# src/less/index.less
# src/utils/tools.js
commit 2e166e9b6684fb6d3b9f14881d24dd5e3e215b31
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 20:21:46 2019 +0800
移除app.js文件
commit ebd1b3c534d93265e59e85dde2b705c050224c4e
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:02:41 2019 +0800
Squashed commit of the following:
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/components/AddContent.vue
commit 387b29eb6eaeb507b1fc03aeecad829012ce8df0
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:55:47 2019 +0800
Squashed commit of the following:
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/common/Label.vue
# src/components/DetailBox.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/Preview.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/utils/tools.js
commit 8f7c125f02a869ee541e89311ef4e662fe227ecd
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:29:21 2019 +0800
Squashed commit of the following:
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/store.js
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/components/PathInfo.vue
# src/store.js
commit 196289f93d75ad97281e9c44ba45b8c0d43e111e
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:34:07 2019 +0800
Squashed commit of the following:
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/common/Label.vue
# src/common/UploadImg.vue
# src/components/AddContent.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/PathInfo.vue
# src/components/Preview.vue
# src/components/Search.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/less/base.less
# src/less/index.less
# src/utils/tools.js
commit 2e166e9b6684fb6d3b9f14881d24dd5e3e215b31
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 20:21:46 2019 +0800
移除app.js文件
commit ebd1b3c534d93265e59e85dde2b705c050224c4e
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:02:41 2019 +0800
Squashed commit of the following:
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/components/AddContent.vue
commit 387b29eb6eaeb507b1fc03aeecad829012ce8df0
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:55:47 2019 +0800
Squashed commit of the following:
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/common/Label.vue
# src/components/DetailBox.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/Preview.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/utils/tools.js
commit 8f7c125f02a869ee541e89311ef4e662fe227ecd
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:29:21 2019 +0800
Squashed commit of the following:
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/common/Input.vue
# src/common/OptionInp.vue
# src/components/AddContent.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/Symptom.vue
# src/utils/tools.js
commit dfcb93f3267ded88365e77dd0f6ac50001e64eca
Author: liucf <liucf@zjlantone.com>
Date: Fri Aug 2 09:43:00 2019 +0800
安卓手机详情输入框问题；图片居中及一些细节修改
commit 24ddb2780a68e0fc9aced7595c78aeea2039347c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 11:45:05 2019 +0800
隐藏儿童体质检测并居中
commit acc866d184ae50ef63d162752250bea94327a44d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 10:07:24 2019 +0800
合并test分支
Squashed commit of the following:
commit 196289f93d75ad97281e9c44ba45b8c0d43e111e
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:34:07 2019 +0800
Squashed commit of the following:
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/common/Label.vue
# src/common/UploadImg.vue
# src/components/AddContent.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/PathInfo.vue
# src/components/Preview.vue
# src/components/Search.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/less/base.less
# src/less/index.less
# src/utils/tools.js
commit 2e166e9b6684fb6d3b9f14881d24dd5e3e215b31
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 20:21:46 2019 +0800
移除app.js文件
commit ebd1b3c534d93265e59e85dde2b705c050224c4e
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:02:41 2019 +0800
Squashed commit of the following:
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/components/AddContent.vue
commit 387b29eb6eaeb507b1fc03aeecad829012ce8df0
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:55:47 2019 +0800
Squashed commit of the following:
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/common/Label.vue
# src/components/DetailBox.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/Preview.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/utils/tools.js
commit 8f7c125f02a869ee541e89311ef4e662fe227ecd
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:29:21 2019 +0800
Squashed commit of the following:
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/store.js
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# package-lock.json
# src/common/CheckBox.vue
# src/common/ComTextArea.vue
# src/common/Input.vue
# src/common/Label.vue
# src/common/MultiLineInput.vue
# src/common/OptionInp.vue
# src/common/Radio.vue
# src/common/UploadImg.vue
# src/components/AddContent.vue
# src/components/Detail.vue
# src/components/DetailBox.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/Preview.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit f25eb2ba002cb147d21773b5c1cf7bb030366971
Author: liucf <liucf@zjlantone.com>
Date: Fri Aug 2 10:23:38 2019 +0800
Squashed commit of the following:
commit dfcb93f3267ded88365e77dd0f6ac50001e64eca
Author: liucf <liucf@zjlantone.com>
Date: Fri Aug 2 09:43:00 2019 +0800
安卓手机详情输入框问题；图片居中及一些细节修改
commit 24ddb2780a68e0fc9aced7595c78aeea2039347c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 11:45:05 2019 +0800
隐藏儿童体质检测并居中
commit acc866d184ae50ef63d162752250bea94327a44d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 10:07:24 2019 +0800
合并test分支
Squashed commit of the following:
commit 196289f93d75ad97281e9c44ba45b8c0d43e111e
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:34:07 2019 +0800
Squashed commit of the following:
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/common/Label.vue
# src/common/UploadImg.vue
# src/components/AddContent.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/PathInfo.vue
# src/components/Preview.vue
# src/components/Search.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/less/base.less
# src/less/index.less
# src/utils/tools.js
commit 2e166e9b6684fb6d3b9f14881d24dd5e3e215b31
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 20:21:46 2019 +0800
移除app.js文件
commit ebd1b3c534d93265e59e85dde2b705c050224c4e
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:02:41 2019 +0800
Squashed commit of the following:
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/components/AddContent.vue
commit 387b29eb6eaeb507b1fc03aeecad829012ce8df0
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:55:47 2019 +0800
Squashed commit of the following:
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/common/Label.vue
# src/components/DetailBox.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/Preview.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/utils/tools.js
commit 8f7c125f02a869ee541e89311ef4e662fe227ecd
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:29:21 2019 +0800
Squashed commit of the following:
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/store.js
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# package.json
# src/common/Input.vue
# src/common/OptionInp.vue
# src/common/UploadImg.vue
# src/components/AddContent.vue
# src/components/Detail.vue
# src/components/DetailBox.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/PathInfo.vue
# src/components/Symptom.vue
# src/less/base.less
# src/utils/tools.js
commit 904097d830c4fccce478fcf26b8fe36e4f3dd671
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 12:19:09 2019 +0800
Squashed commit of the following:
commit 24ddb2780a68e0fc9aced7595c78aeea2039347c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 11:45:05 2019 +0800
隐藏儿童体质检测并居中
commit acc866d184ae50ef63d162752250bea94327a44d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 30 10:07:24 2019 +0800
合并test分支
Squashed commit of the following:
commit 196289f93d75ad97281e9c44ba45b8c0d43e111e
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:34:07 2019 +0800
Squashed commit of the following:
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/common/Label.vue
# src/common/UploadImg.vue
# src/components/AddContent.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/PathInfo.vue
# src/components/Preview.vue
# src/components/Search.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/less/base.less
# src/less/index.less
# src/utils/tools.js
commit 2e166e9b6684fb6d3b9f14881d24dd5e3e215b31
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 20:21:46 2019 +0800
移除app.js文件
commit ebd1b3c534d93265e59e85dde2b705c050224c4e
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:02:41 2019 +0800
Squashed commit of the following:
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/components/AddContent.vue
commit 387b29eb6eaeb507b1fc03aeecad829012ce8df0
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:55:47 2019 +0800
Squashed commit of the following:
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/common/Label.vue
# src/components/DetailBox.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/Preview.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/utils/tools.js
commit 8f7c125f02a869ee541e89311ef4e662fe227ecd
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:29:21 2019 +0800
Squashed commit of the following:
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/store.js
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/components/PathInfo.vue
# src/store.js
commit 196289f93d75ad97281e9c44ba45b8c0d43e111e
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:34:07 2019 +0800
Squashed commit of the following:
commit 932fd623c810f135d6ff0233355c90c330da29ac
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:25:38 2019 +0800
Squashed commit of the following:
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/components/Search.vue
commit 49273a3280646712f113a7ac821ec4cf5f6040f3
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 15:23:51 2019 +0800
1
commit 3817c1bf08f9f479ca76722657767031f4913dd1
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:53:35 2019 +0800
Squashed commit of the following:
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit ae891826a6fd99dc52dcb5292e10a113beee5ba8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 14:44:36 2019 +0800
细节调整
Squashed commit of the following:
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit d33ce1e5070e97e451eae6c470ae6a6b762e5caa
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 25 09:41:47 2019 +0800
删除app.js
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/common/Label.vue
# src/common/UploadImg.vue
# src/components/AddContent.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/PathInfo.vue
# src/components/Preview.vue
# src/components/Search.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/less/base.less
# src/less/index.less
# src/utils/tools.js
commit 2e166e9b6684fb6d3b9f14881d24dd5e3e215b31
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 20:21:46 2019 +0800
移除app.js文件
commit ebd1b3c534d93265e59e85dde2b705c050224c4e
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:02:41 2019 +0800
Squashed commit of the following:
commit b883b1199191533a27f3bac7e3c399a49e17d4a1
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 15:00:25 2019 +0800
预览信息
commit fd789c335f0b7f46bc0dd5f4f9562edc8e88fbaa
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:57:25 2019 +0800
预览->预览并提交病历
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/components/AddContent.vue
commit 387b29eb6eaeb507b1fc03aeecad829012ce8df0
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:55:47 2019 +0800
Squashed commit of the following:
commit 02d9cff9dbb9e0e55ec1f395b038db28f41b6a15
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:45:31 2019 +0800
Squashed commit of the following:
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 9e08232f929375c255411604f52896f7b8cd5f73
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 14:33:37 2019 +0800
moduleType调整
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# src/common/Label.vue
# src/components/DetailBox.vue
# src/components/DiagTreat.vue
# src/components/Others.vue
# src/components/Preview.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/utils/tools.js
commit 8f7c125f02a869ee541e89311ef4e662fe227ecd
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:29:21 2019 +0800
Squashed commit of the following:
commit 89d77a00750aca7bd7af5c796a06bc897162493a
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 24 11:26:55 2019 +0800
详情页新增提示信息，input组件number类型限制不能输入非数字
commit 6ad0e3b0182feb60a14d406b54de47bad0a57c5f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 18:19:16 2019 +0800
Squashed commit of the following:
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/AddContent.vue
# src/utils/tools.js
commit 64d0a8760ae12b885445ae4600b8069a2775fc9d
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 17:53:37 2019 +0800
新增带输入框选项组件
Squashed commit of the following:
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit a1ac90cb6f56c268156fe4161da59978b80ed5e8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 15:24:04 2019 +0800
type配置抽离，诊疗和其他史模块页新增单选多选
commit c161fd692a8c1ccf9c3a315875a3df58d1c1395f
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:35:18 2019 +0800
合并byll分支
Squashed commit of the following:
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
# Conflicts:
# src/common/MultiLineInput.vue
# src/components/TabPage.vue
commit 0545a51ad2097f06a87f4157dbfce26879ac8fb1
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 23 10:32:08 2019 +0800
配置
commit b1680dd16c8f7b61a11fad0cc1c19d63317851da
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 17:00:11 2019 +0800
Squashed commit of the following:
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 1248f0c33c19d69b001bbfb1c574c3b8f02a21f6
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:40:24 2019 +0800
input背景透明，兼容支付宝扫一扫
commit 1cd0e62c900da2b1f0e6981d36d33d4a61b19166
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 14:25:46 2019 +0800
foot层级
commit 11298d5cc2ce2710234b24f7d77e06a79a10f23b
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 22 11:51:23 2019 +0800
细节优化
commit e97b925baf94405ad472dea79bc5a76d4bc9cea8
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 17:07:34 2019 +0800
合并byll分支
Squashed commit of the following:
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 3a8f52dee4a2b79471621f2c199bd6a1a6ffa8ad
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 16:26:26 2019 +0800
校验是否已填入参修改
commit 3de69e6ac450b25501d82efe5798fe568c061370
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 18 14:44:04 2019 +0800
多选带输入及互斥功能完成
commit 3f646b797ded0a98fec3ba8ea9dec8dfb475903f
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 17 17:54:14 2019 +0800
多选带输入框
commit 63952d0a2ccec97543bc85b5e42d5dd65c509c3f
Author: Luolei <16657115156@163.com>
Date: Tue Jul 16 11:14:08 2019 +0800
保存预览
commit 3ef5b31d31dae0ce9ad9b98fb6a1d5edf213cc03
Merge: 6479869 71b2343
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 10:04:36 2019 +0800
Merge branch 'dev' into byll
commit 6479869fcad0f77e01c4e6c3f4cb3daa6bb87193
Author: Luolei <16657115156@163.com>
Date: Mon Jul 15 09:34:11 2019 +0800
数据处理
commit 71b2343c350895333e8ca41cb4e816581febf0a1
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 17:35:46 2019 +0800
单选带输入框
Squashed commit of the following:
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
# Conflicts:
# src/components/Symptom.vue
commit 51ee3ec2c0cbb5ba05694a2997ca4386f175abe3
Merge: 46c036e 5441afc
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:47:05 2019 +0800
Merge branch 'dev' into byll
commit 46c036e584762d2ccd1adb4713e78deae8fe890d
Merge: 0e6e0d9 5bd71c3
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:20 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit 0e6e0d96bde482c578fc25b101b287bdc12e68f7
Author: Luolei <16657115156@163.com>
Date: Fri Jul 12 10:37:13 2019 +0800
检索判断
commit 5bd71c3bc78864981c754befd7191968348efe92
Author: liucf <liucf@zjlantone.com>
Date: Fri Jul 12 09:57:23 2019 +0800
配置项
commit 5441afcff31bd0effccef58f5ba191972cb5e6f2
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 17:36:35 2019 +0800
tab和详情页动画
commit f951842a2e9c38782ad1d203bb0371229eee8615
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:22:45 2019 +0800
text文本
commit bc0334d2f9433b08466fad4a052abf8c3e68a4f9
Merge: a76ca62 6cf8212
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 17:03:13 2019 +0800
Merge branch 'dev' into byll
commit a76ca621c03cd43366a3b4d94920110cc953fded
Author: Luolei <16657115156@163.com>
Date: Thu Jul 11 16:34:13 2019 +0800
搜索，完成提示弹窗
commit 6cf8212bb7e9f89572feb9a6c4beec37ed8c7f9f
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 11 15:02:24 2019 +0800
清空，其他情况
commit d4c321a248ca8460a3d5212ce6574e2193bb6e7b
Merge: f0cc127 bf08847
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:07 2019 +0800
Merge branch 'byll' of http://192.168.2.236:10080/zhouna/preliminary into byll
commit f0cc127f19d77f83b7350f8ac47b6b0902eaf8a4
Author: Luolei <16657115156@163.com>
Date: Wed Jul 10 16:01:00 2019 +0800
多列填写组件优化
commit 844b5dd59309d1c1bd19517852ba92bfb59e0a85
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:40:44 2019 +0800
合并代码并更改环境
Squashed commit of the following:
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 10 15:36:17 2019 +0800
合并development分支
commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:32:53 2019 +0800
Merge branch 'development' into byll
commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:20:36 2019 +0800
README.md
commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date: Tue Jul 9 19:13:20 2019 +0800
环境切换
commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 20:32:12 2019 +0800
多选数据处理及诊疗
commit 9135a5a273a904c4358377833564e3177e12bad1
Author: Luolei <16657115156@163.com>
Date: Mon Jul 8 17:25:16 2019 +0800
测试多图片上传带参数type
commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 8 14:34:17 2019 +0800
test build
commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:38:52 2019 +0800
合并dev
Squashed commit of the following:
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 17:33:09 2019 +0800
症状情况数据处理
commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
Merge: 2817f6f 29702b2
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:51:22 2019 +0800
Merge branch 'development' into dev
commit 29702b2314ccf5bde3533a60a542d78798e33cd1
Author: liucf <liucf@zjlantone.com>
Date: Sat Jul 6 13:40:08 2019 +0800
数据处理
Squashed commit of the following:
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
Author: Luolei <16657115156@163.com>
Date: Sat Jul 6 13:26:30 2019 +0800
改回配置
commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
Author: Luolei <16657115156@163.com>
Date: Fri Jul 5 17:10:57 2019 +0800
多列填写，预览
commit d1d29e086ad247da059fcd1b81bbe4dac88cb97b
Author: liucf <liucf@zjlantone.com>
Date: Thu Jul 4 16:53:09 2019 +0800
图片组件
commit 54aa3aad2d6163449bff54abd5fbee53f8010941
Merge: 9b50ae5 ea78834
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 20:22:00 2019 +0800
Merge remote-tracking branch 'remotes/origin/development' into dev
commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 19:43:27 2019 +0800
新增文本域组件
commit ea78834659676ba3260ce0dd8be894700f86cdca
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 17:46:01 2019 +0800
上传图片组件-未完
commit 76d237f82c016887e09f6c1eb12a3a6dfb1ff943
Author: liucf <liucf@zjlantone.com>
Date: Wed Jul 3 15:28:24 2019 +0800
tab流程
commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
Author: Luolei <16657115156@163.com>
Date: Wed Jul 3 09:56:18 2019 +0800
添加补充内容页面
commit 445308afd3a52b1707d759f5e1e1c8c572eadad2
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 20:33:22 2019 +0800
单选数据处理
commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:38:56 2019 +0800
Squashed commit of the following:
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit abb05f77689576a0834513d2a21f5f05b321e495
Author: liucf <liucf@zjlantone.com>
Date: Tue Jul 2 11:36:51 2019 +0800
增加图片
commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
Author: liucf <liucf@zjlantone.com>
Date: Mon Jul 1 20:44:08 2019 +0800
新增弹窗，单选，多选，待完善
commit 565f06729383a7df1bfde511faacb5979432a7da
Author: liucf <liucf@zjlantone.com>
Date: Fri Jun 28 17:36:42 2019 +0800
患者信息页完成
commit aa6661b1eda935e0ffbf4debd665a2254e358269
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 25 17:03:04 2019 +0800
start
# Conflicts:
# build/webpack.dev.conf.js
# src/common/UploadImg.vue
commit 5014effc6ac19096716a467dc19c52edac3a631e
Author: liucf <liucf@zjlantone.com>
Date: Mon Aug 5 14:33:16 2019 +0800
Squashed commit of the following:
commit 0b1b12d0a1b7348293e9885aa2ba50a95f456ac2
Merge: 8e2d286 e6b6aa7
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 11:07:52 2019 +0800
Merge branch 'dev' into byll
commit e6b6aa7427e3b8d3220d96b960cc78fd4dadcb1f
Merge: b37ccb4 655abe4
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 10:59:18 2019 +0800
Merge branch 'dev' of http://192.168.2.236:10080/zhouna/preliminary into dev
commit 8e2d2868688f6a57ae4eae38153052e95d8baff5
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 10:58:36 2019 +0800
错误处理
commit 5924cb1cfc6ed3637926321c5bc04c05b8574bd9
Merge: 9d5ed16 b37ccb4
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 09:43:40 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# build/webpack.dev.conf.js
# src/store.js
commit b37ccb44dd5edad05538537f46a180c9eb864c4a
Merge: 7f32ba5 708cae3
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 09:36:08 2019 +0800
Merge branch 'dev' of http://192.168.2.236:10080/zhouna/preliminary into dev
commit 9d5ed165f7fdef257e00cacbab92dc14617dd997
Author: Luolei1992 <16657115156@163.com>
Date: Mon Aug 5 09:35:21 2019 +0800
改下预览模块位置顺序
commit 682c8695a1543b7a5af7fe45d5c057032363b272
Author: Luolei1992 <16657115156@163.com>
Date: Thu Aug 1 17:26:14 2019 +0800
bugfix
commit 7f32ba51b316ef463b7487c03c3b8ee032e89897
Author: Luolei1992 <16657115156@163.com>
Date: Thu Aug 1 16:33:42 2019 +0800
11
commit 0aea0ef6630683625a5d671f878d4ea8fb56916c
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 15:13:30 2019 +0800
等键盘全部收起，添加延迟
commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:46:27 2019 +0800
Merge branch 'dev' into byll
commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 11:34:18 2019 +0800
搜索页bug
commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 10:12:11 2019 +0800
预览患者信息修改
commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date: Thu Jul 25 09:40:47 2019 +0800
添加value判断各模块显示与否
commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:57:02 2019 +0800
名字统一
commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:33:37 2019 +0800
Merge branch 'dev' into byll
commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date: Wed Jul 24 13:23:25 2019 +0800
241
commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 17:08:16 2019 +0800
数据处理
commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:47:37 2019 +0800
Merge branch 'dev' into byll
# Conflicts:
# config/index.js
# src/common/MultiLineInput.vue
# src/components/Symptom.vue
# src/components/TabPage.vue
# src/store.js
# src/utils/tools.js
commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 15:24:38 2019 +0800
数字键盘弹起输入问题解决
commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:27:55 2019 +0800
类型修改
commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date: Tue Jul 23 10:20:19 2019 +0800
type类型改变
commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:49:52 2019 +0800
Merge branch 'dev' into byll
commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date: Mon Jul 22 15:39:22 2019 +0800
模块配置
commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:39:19 2019 +0800
Merge branch 'dev' into byll
commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date: Thu Jul 18 16:38:09 2019 +0800
图片上传数据结构修改
commit 5c9fad31def62948c95d8700ba95d6d92c179d95
Author: liucf <liucf@zjlantone.com>
Date: Mon Aug 5 14:02:15 2019 +0800
明细页增加多列填写
# Conflicts:
# src/common/MultiLineInput.vue
# src/common/OptionInp.vue
# src/components/Detail.vue
# src/utils/tools.js
liucf
3 changed files with 36 additions and 23 deletions
+ 8
- 2
src/common/OptionInp.vue
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
+ 8
- 10
src/components/Detail.vue
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
+ 20
- 11
src/utils/tools.js
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||