Главная Обзор Помощь
Регистрация Вход
front
/
preliminary
2
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

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
liucf 5 лет назад
Родитель
f25eb2ba00
Сommit
97ee034f94
19 измененных файлов с 10186 добавлено и 5630 удалено
Разделённый вид Показать статистику Diff
  1. 9982 5546
      package-lock.json
  2. 33 7
      src/common/CheckBox.vue
  3. 1 1
      src/common/ComTextArea.vue
  4. 1 1
      src/common/Input.vue
  5. 2 2
      src/common/Label.vue
  6. 7 2
      src/common/MultiLineInput.vue
  7. 9 4
      src/common/OptionInp.vue
  8. 30 4
      src/common/Radio.vue
  9. 1 1
      src/common/UploadImg.vue
  10. 2 2
      src/components/AddContent.vue
  11. 55 11
      src/components/Detail.vue
  12. 11 4
      src/components/DetailBox.vue
  13. 7 5
      src/components/DiagTreat.vue
  14. 5 5
      src/components/Others.vue
  15. 23 25
      src/components/Preview.vue
  16. 2 2
      src/components/Symptom.vue
  17. 3 2
      src/components/TabPage.vue
  18. 5 1
      src/store.js
  19. 7 5
      src/utils/tools.js

Разница между файлами не показана из-за своего большого размера
+ 9982 - 5546
package-lock.json


+ 33 - 7
src/common/CheckBox.vue
Просмотреть файл 

@@ -4,7 +4,7 @@
 
     <p v-for="(it,index) in datas.questionDetailList" :key="it.id" class="list" @click="handleClick(it,index)">
 
       <img :src="it.select==1?check:defaultPic">
 
       <!-- <span :class="{'check':it.select==1}">{{it.name}}</span> -->
 
-      <span v-if="(it.name.indexOf('${'))==-1" :class="[{'check':it.select==1},{'exclu':exclusion !==999 && it.exclusion !== exclusion}]">{{it.name}}</span>
 
+      <span v-if="((it.description||it.name).indexOf('${'))==-1" :class="[{'check':it.select==1},{'exclu':exclusion !==999 && it.exclusion !== exclusion}]">{{it.description||it.name}}</span>
 
       <!-- <MultiLineInput v-else 
           @handleInp="inpVal($event,index)"
 
           :msg="it.name" 
@@ -13,7 +13,12 @@
 
           :inline="true" 
           :select="it.select==1" 
           /> -->
 
-      <OptionInp v-else :item="it" @handleInp="inpVal($event,index)" />
 
+      <OptionInp v-else 
+          :item="it" 
+          ref="inp"
 
+          @handleInp="inpVal($event,index)" 
+          :exclu="exclusion !==999 && it.exclusion !== exclusion" 
+          />
 
     </p>
 
   </div>
 
 </template>
 
@@ -42,6 +47,7 @@ import OptionInp from '../common/OptionInp.vue';
 
     },
 
     methods:{
 
       handleClick(it,index){
 
+        const that = this;
 
         const list = this.datas;
 
         let data = list.questionDetailList&&list.questionDetailList.slice(0);
 
         // 处理互斥
 
@@ -71,22 +77,42 @@ import OptionInp from '../common/OptionInp.vue';
 
             this.exclusion = filArr1[0].exclusion;
 
           }
 
         }
 
-        let value = "";
 
+        let value = ""; //医生
 
+        let valueP = ""; //患者
 
         for(let k in data){
 
           if(data[k].select==1){
 
-            value += data[k].name + '，'
 
+            // 选中该项时，带的输入框内有值则加上
 
+            if(data[k].value){
 
+              let newVal = '#{' + data[k].value + '}';
 
+              let str = data[k].name.replace(patt,newVal);
 
+              let strP = (data[k].description || data[k].name).replace(patt,newVal);
 
+              value += str + '，';
 
+              valueP += strP + '，';
 
+            }else{
 
+              value += data[k].name + '，';
 
+              valueP += (data[k].description || data[k].name) + '，';
 
+            }
 
+            
           }
 
         }
 
-        const newData = Object.assign({},this.datas,{questionDetailList:data},{value:value?value.substring(0,value.length-1):''})
 
+        const newData = Object.assign({},this.datas,{questionDetailList:data},{value:value?value.substring(0,value.length-1):''},{valueP:valueP?valueP.substring(0,valueP.length-1):''});
 
         this.$emit("updata",newData);
 
       },
 
       inpVal(val,index){//输入框失焦处理
 
         let valueStr = this.datas.value;
 
         if(valueStr){
 
           // let patt = /\$\{[^\]]+\}/g;
 
-          let newVal =  val;
 
-          const str = valueStr.replace(patt,newVal);
 
+          let rePatt = /\#\{[^\]]+\}/g;
 
+          let newVal = '#{' +val+'}';
 
+          let str = "";
 
+          // 区分第一次输入还是修改
 
+          if(valueStr.indexOf("${") !== -1){
 
+            str = valueStr.replace(patt,newVal);
 
+          }else{//修改
 
+            str = valueStr.replace(rePatt,newVal);
 
+          }
 
           this.datas.value = str;
 
+          this.datas.valueP = str;
 
         }
 
         
         // 输入框回读

+ 1 - 1
src/common/ComTextArea.vue
Просмотреть файл 

@@ -36,7 +36,7 @@ export default {
 
       this.$emit('changeAreaVal',this.txt)
 
     },
 
     blur(){
 
-      const newData = Object.assign({},this.item,{value:this.txt});
 
+      const newData = Object.assign({},this.item,{value:this.txt,valueP:this.txt});
 
       this.$emit("updata",newData);
 
     }
 
   },

+ 1 - 1
src/common/Input.vue
Просмотреть файл 

@@ -27,7 +27,7 @@
 
       },
 
       blur(){
 
         this.borColor = false;
 
-        const newData = Object.assign({},this.item,{value:this.val});
 
+        const newData = Object.assign({},this.item,{value:this.val,valueP:this.val});
 
         this.$emit("updata",newData);
 
       }
 
     },

+ 2 - 2
src/common/Label.vue
Просмотреть файл 

@@ -1,7 +1,7 @@
 
 <template>
 
   <div class="label-wrap" v-if="item">
 
     <p v-for="(it,index) in datas.questionMapping" :key="it.id" :class="['symp',{'check':it.select==1},{'exclu':exclusion !==999 && it.exclusionType !== exclusion}]" @click="handleClick(it,index)">
 
-      <span>{{it.name}}</span>
 
+      <span>{{it.description||it.name}}</span>
 
       <!-- <span v-if="it.select==1" @click="deletSymp($event,it,index)"><img src="../images/delete.png" alt=""></span> -->
 
       <span v-if="it.select==1" @click="deletSymp($event,it,index)"><img src="../images/del.png" alt=""></span>
 
     </p>
 
@@ -62,7 +62,7 @@ import {moduleCP} from '@utils/tools';
 
         }
 
         // 存值到store
 
         this.$store.commit('setDatas',{type:this.moduleType,data:newItem,pId:this.datas.id,ppId:this.ppId});
 
-        this.$store.commit('setText',{type:this.moduleType,text:it.name,pId:it.id});
 
+        this.$store.commit('setText',{type:this.moduleType,text:it.name,textP:(it.description||it.name),pId:it.id});
 
         if(it.questionMapping&&it.questionMapping.length>0){//有明细
 
           this.$emit("setDetail",{detail:it,ppId:this.ppId})
 
         }

+ 7 - 2
src/common/MultiLineInput.vue
Просмотреть файл 

@@ -80,7 +80,7 @@ export default {
 
       // 如果该项未选中，则不存值
 
       const select = this.part.select;
 
       // if(!select){return}
 
-      const newData = Object.assign({},this.part,{value:this.txt,controlType:3});
 
+      const newData = Object.assign({},this.part,{value:this.txt,controlType:3,valueP:this.txt});
 
       this.$emit("updata",newData);
 
       this.$emit('handleInp',this.txt);
 
     },
 
@@ -115,7 +115,7 @@ export default {
 
       color: #4F50FF;
 
       text-align: left;
 
       border: 0 none;
 
-      border-bottom: 1px solid #b0afaf !important;
 
+      // border-bottom: 1px solid #b0afaf !important;
 
       border-radius: 0;
 
       // background-color: #fff;
 
       background: transparent;
 
@@ -142,6 +142,7 @@ export default {
 
   }
 
   .prefix {
 
     float: left;
 
+    color: #666;
 
   }
 
   .suffix {
 
     position: absolute;
 
@@ -150,6 +151,7 @@ export default {
 
     width: 1rem;
 
     text-align: right;
 
     text-align: left;
 
+    color: #666;
 
     line-height: .36rem;
 
   }
 
   .sticP {
 
@@ -162,6 +164,9 @@ export default {
 
       position: relative;
 
       overflow: hidden;
 
       min-width: 1rem;
 
+      span {
 
+        color: #666;
 
+      }
 
     }
 
   }
 
   .check{

+ 9 - 4
src/common/OptionInp.vue
Просмотреть файл 

@@ -1,11 +1,12 @@
 
 <!-- 带输入框选项 -->
 
 <template>
 
-  <div :class="['inpbox',{'check':item.select}]">
 
+  <div :class="['inpbox',{'check':item.select},{'exclu':exclu}]">
 
     <span class="prefix" v-if="msg.prefix">{{msg.prefix}}</span>
 
     <div class="inp" @click="preClick">
 
       <input :type="msg.type=='number'?'tel':'text'" 
               :placeholder="msg.placeholder"
 
               :disabled="select!=1"
 
+              :class="{'exclu':exclu}"
 
               v-model="txt"
 
               @click="handleCli"
 
               @blur="handleBlur"
 
@@ -25,9 +26,10 @@ import { getExpStr,scrollToV} from '@utils/tools';
 
         select:0
 
       }
 
     },
 
-    props:['item'],
 
+    props:['item','exclu'],
 
     mounted(){
 
-      this.msg = getExpStr(this.item.name);
 
+      const text = this.item.description || this.item.name;
 
+      this.msg = getExpStr(text);
 
       this.select = this.item.select;
 
     },
 
     methods:{
 
@@ -80,5 +82,8 @@ import { getExpStr,scrollToV} from '@utils/tools';
 
     .check{
 
       color: #4F50FF;
 
     }
 
+    .exclu{
 
+      color:#e6e7e9 !important;
 
+    }
 
   }
 
-</style>
 
+</style>

+ 30 - 4
src/common/Radio.vue
Просмотреть файл 

@@ -4,7 +4,7 @@
 
     <p v-for="(it,index) in datas.questionDetailList" :key="it.id" class="list" @click="handleClick(it,index)">
 
       <img :src="it.select==1?check:defaultPic">
 
       <!-- <span :class="{'check':it.select==1}">{{it.name}}</span> -->
 
-      <span v-if="(it.name.indexOf('${'))==-1" :class="{'check':it.select==1}">{{it.name}}</span>
 
+      <span v-if="((it.description||it.name).indexOf('${'))==-1" :class="{'check':it.select==1}">{{it.description||it.name}}</span>
 
       <!-- <MultiLineInput v-else 
           @handleInp="inpVal($event,index)"
 
           :msg="it.name" 
@@ -44,23 +44,49 @@ import OptionInp from '../common/OptionInp.vue';
 
         const list = this.datas;
 
         let data = list.questionDetailList&&list.questionDetailList.slice(0); //数组深拷贝？
 
         let value = "";
 
+        let valueP = "";
 
         for(let i=0;i<data.length; i++){
 
           data[i].select = 0
 
           if(i==index){
 
             data[i].select = 1;
 
-            value = data[i].name;
 
+            // value = data[i].name;
 
+            // 选中该项时，带的输入框内有值则加上
 
+            if(data[i].value){
 
+              let newVal = '#{' + data[i].value + '}';
 
+              let str = data[i].name.replace(patt,newVal);//医生
 
+              let strP = (data[i].description ||data[i].name).replace(patt,newVal);//患者
 
+              value = str ;
 
+              valueP = strP ;
 
+            }else{
 
+              value = data[i].name ;
 
+              valueP = data[i].name ;
 
+            }
 
           }
 
         }
 
-        const newData = Object.assign({},this.datas,{questionDetailList:data},{value:value})
 
+        // const newData = Object.assign({},this.datas,{questionDetailList:data},{value:value})
 
+        const newData = Object.assign({},this.datas,{questionDetailList:data,value:value,valueP:valueP})
 
         this.$emit("updata",newData);
 
       },
 
       inpVal(val,index){//输入框失焦处理
 
         let valueStr = this.datas.value;
 
-        if(valueStr){
 
+        /*if(valueStr){
 
           // let patt = /\$\{[^\]]+\}/g;
 
           let newVal =  val;//修改时替换值用
 
           const str = valueStr.replace(patt,newVal);
 
           this.datas.value = str;
 
+        }*/
 
+        if(valueStr){
 
+          let rePatt = /\#\{[^\]]+\}/g;
 
+          let newVal = '#{' +val+'}';
 
+          let str = "";
 
+          // 区分第一次输入还是修改
 
+          if(valueStr.indexOf("${") !== -1){
 
+            str = valueStr.replace(patt,newVal);
 
+          }else{//修改
 
+            str = valueStr.replace(rePatt,newVal);
 
+          }
 
+          this.datas.value = str;
 
+          this.datas.valueP = str;//输入框内容无医生患者之分
 
         }
 
         
         // 输入框回读

+ 1 - 1
src/common/UploadImg.vue
Просмотреть файл 

@@ -229,4 +229,4 @@ export default {
 
     }
 
   }
 
 }
 
-</style>
 
+</style>

+ 2 - 2
src/components/AddContent.vue
Просмотреть файл 

@@ -3,7 +3,7 @@
 
     <div class="choose">
 
       <ul class="addPart">
 
         <li v-for="(item,idx) in dataTrd">
 
-          <p class="question">{{idx+1 + '. ' +item.name}}</p>
 
+          <p class="question">{{idx+1 + '. ' +(item.description||item.name)}}</p>
 
           <Radio v-if="item.controlType==1" 
             :item="item"
 
             :key="item.id"
 
@@ -28,7 +28,7 @@
 
           >
 
             <MultiLineInput
 
               v-if="item.controlType == 3"
 
-              :msg="part.name"
 
+              :msg="part.description||part.name"
 
               :part="part"
 
               @updata="updataData($event,index,item)"
 
             ></MultiLineInput>

+ 55 - 11
src/components/Detail.vue
Просмотреть файл 

@@ -2,7 +2,7 @@
 
   <div class="detail-wrap">
 
     <!-- <div v-for="(item,index) in datas"> -->
 
     <div v-for="(item,index) in checkDatas.questionMapping">
 
-      <p class="quest">{{index + 1 +'.' + item.name}}</p>
 
+      <p class="quest">{{index + 1 +'.' + (item.description || item.name)}}</p>
 
       <Radio v-if="item.controlType==1" 
             :item="item"
 
             :key="item.id"
 
@@ -20,6 +20,17 @@
 
             :item="item"
 
             :key="item.id"
 
             @updata="updataData"/>
 
+      <template
 
+        v-if="item.controlType == 3"
 
+        v-for="(part,index) in item.questionDetailList"
 
+      >
 
+        <MultiLineInput
 
+          v-if="item.controlType == 3"
 
+          :msg="part.description||part.name"
 
+          :part="part"
 
+          @updata="updataData($event,item)"
 
+        ></MultiLineInput>
 
+      </template>
 
     </div>
 
   </div>
 
 </template>
 
@@ -28,6 +39,7 @@ import Radio from '../common/Radio.vue';
 
 import CheckBox from '../common/CheckBox.vue';
 
 import Input from '../common/Input.vue';
 
 import ComTextArea from '../common/ComTextArea.vue';
 
+import MultiLineInput from '../common/MultiLineInput.vue';
 
 import {patt} from '@utils/tools.js'
 
 // 将获取到的数据源转换成私有数据，处理选择事件。点击完成后统一存到store中，便于回读
 
   export default {
 
@@ -46,16 +58,38 @@ import {patt} from '@utils/tools.js'
 
       Radio,
 
       CheckBox,
 
       Input,
 
-      ComTextArea
 
+      ComTextArea,
 
+      MultiLineInput
 
     },
 
     methods:{
 
-      updataData(data){
 
+      updataData(data,item){
 
         const origMapping = this.datas.questionMapping;
 
         let mapping = this.checkDatas.questionMapping;
 
         for(let i in origMapping){
 
-          if(origMapping[i].id==data.id){
 
-            mapping.splice(i,1,data)
 
+          if(data.controlType==3){//多列类型多一层
 
+            if(mapping[i].id == item.id){
 
+              mapping[i].value = '';
 
+              mapping[i].valueP = '';
 
+              let detList = mapping[i].questionDetailList;
 
+              for(let k in detList){//替换
 
+                if(detList[k].id==data.id){
 
+                  detList.splice(k,1,data)
 
+                }
 
+              } 
+              for(let n in detList){//给父级赋值
 
+                if(detList[n].value){
 
+                  mapping[i].value += detList[n].value+'，';
 
+                  mapping[i].valueP += detList[n].valueP+'，';
 
+                }
 
+              }
 
+            }
 
+            
+          }else{
 
+            if(origMapping[i].id==data.id){
 
+              mapping.splice(i,1,data)
 
+            }
 
           }
 
+          
         }
 
         // 实时更新清空样式
 
         if(data.value){
 
@@ -73,43 +107,53 @@ import {patt} from '@utils/tools.js'
 
         this.finished = true;
 
         this.checkDatas = Object.assign({},this.checkDatas,{select:1});
 
         const datas = this.checkDatas.questionMapping;
 
-        let text = "";
 
+        let text = ""; //医生
 
+        let textP = "";//患者
 
         for(let i in datas){
 
           if(datas[i].value){
 
             text += datas[i].value+'，';
 
+            textP += datas[i].valueP+'，';
 
           }
 
         }
 
-        // let msg = this.checkDatas.name+ '，' + text.substring(0,text.length-1);
 
+
 
         let msg = this.checkDatas.name+ '，' + text;
 
+        let msgP = (this.checkDatas.description || this.checkDatas.name)+ '，' + textP;
 
         let newMsg = "";
 
+        let newMsgP = "";
 
         if(msg[msg.length-1] == '，'){
 
           newMsg = msg.substring(0,msg.length-1);
 
+          newMsgP = msgP.substring(0,msgP.length-1);
 
         }else{
 
-          newMsg = msg
 
+          newMsg = msg;
 
+          newMsgP = msgP;
 
         }
 
-
 
         this.$store.commit('setDatas',{data:this.checkDatas,pId:this.checkDatas.id,type:this.type,ppId:this.ppId});
 
         // flag是区分点开已选症状 未点完成
 
-        this.$store.commit('setText',{text:newMsg.replace(patt,''),pId:this.checkDatas.id,type:this.type,flag:true});
 
+        // this.$store.commit('setText',{text:newMsg.replace(patt,''),pId:this.checkDatas.id,type:this.type,flag:true});
 
+        // 输入框的值用占位符#{}标识，便于修改
 
+        this.$store.commit('setText',{text:newMsg.replace(patt,'').replace(/\#\{/g,'').replace(/\}/g,''),textP:newMsgP.replace(patt,'').replace(/\#\{/g,'').replace(/\}/g,''),pId:this.checkDatas.id,type:this.type,flag:true});
 
       },
 
       clearData(){//清空
 
         const datas = this.checkDatas.questionMapping;
 
         for(let i in datas){
 
           datas[i].value = "";
 
+          datas[i].valueP = "";
 
           let detaiList = datas[i].questionDetailList;
 
           if(detaiList.length>0){
 
             for(let k in detaiList){
 
               detaiList[k].select = 0;
 
               if(detaiList[k].value){
 
                 detaiList[k].value = "";
 
+                detaiList[k].valueP = "";
 
               }
 
             }
 
           }
 
         }
 
         this.checkDatas = Object.assign({},this.checkDatas,{questionMapping:datas});
 
         let msg = this.checkDatas.name;
 
+        let msgP = (this.checkDatas.description||this.checkDatas.name);
 
         this.$store.commit('setDatas',{data:this.checkDatas,pId:this.checkDatas.id,type:this.type,ppId:this.ppId});
 
-        this.$store.commit('setText',{text:msg,pId:this.checkDatas.id,type:this.type,flag:true});
 
+        this.$store.commit('setText',{text:msg,textP:msgP,pId:this.checkDatas.id,type:this.type,flag:true});
 
       },
 
       check(){// 校验是否有已填项
 
         const datas = this.checkDatas.questionMapping;

+ 11 - 4
src/components/DetailBox.vue
Просмотреть файл 

@@ -15,7 +15,8 @@
 
               :ppId="ppId"
 
               @check="changeCheck($event)"/>
 
     </div>
 
-    <div class="foot" @click="complete">完成</div>
 
+    <!-- <div class="foot" @click="complete">完成</div> -->
 
+    <div :class="['foot',{'noCheck':!checkF}]" @click="complete">完成</div>
 
     <Toast :message="clearTxt" 
           :show="showToast"
 
           @comfirn="comfirnDel" 
@@ -62,9 +63,11 @@
 
       close(){
 
         this.$emit("close");
 
       },
 
-      complete(){
 
-        this.$refs.detail.saveData();
 
-        this.$emit("pComplete");
 
+      complete(){//有选中内容才可以点完成#1919
 
+        if(this.checkF){
 
+          this.$refs.detail.saveData();
 
+          this.$emit("pComplete");
 
+        }
 
       },
 
       changeCheck(flag){
 
         this.checkF = flag;
 
@@ -81,6 +84,7 @@
 
       comfirnDel(){
 
         this.$refs.detail.clearData();
 
         this.showToast = false;
 
+        this.checkF = false;
 
         // 让detail组件更新
 
         // this.privateData = JSON.parse(JSON.stringify(this.data));
 
         this.$emit('reload',this.data.id);
 
@@ -162,6 +166,9 @@
 
     .check{
 
       color: #1A1A1A;
 
     }
 
+    .noCheck{
 
+      background: #CACCFF !important;
 
+    }
 
   }
 
   @keyframes wave {
 
     0%   {top:100% ;}

+ 7 - 5
src/components/DiagTreat.vue
Просмотреть файл 

@@ -4,7 +4,7 @@
 
         v-if="dtoList"
 
         :key="it.id"
 
         class="label">
 
-      <p class="quest">{{i + 1 +'.' + it.name}}</p>
 
+      <p class="quest">{{i + 1 +'.' + (it.description||it.name)}}</p>
 
         <Label v-if="it.controlType==0" 
               :item="it" 
               :indx="i" 
@@ -65,7 +65,7 @@
 
   import DetailBox from './DetailBox.vue';
 
   import Input from '../common/Input.vue';
 
   import ComTextArea from '../common/ComTextArea.vue';
 
-  import {moduleCP} from '@utils/tools';
 
+  import {moduleCP,patt} from '@utils/tools';
 
   import Radio from '../common/Radio.vue';
 
   import CheckBox from '../common/CheckBox.vue';
 
   export default {
 
@@ -115,8 +115,10 @@
 
         let textArr = this.checkText;
 
         let msg = "";
 
         for(let k in textArr){
 
-          msg += textArr[k].text + '；'
 
-        }
 
+          if(textArr[k].textP){
 
+            msg += textArr[k].textP + '；'
 
+          }
 
+        }          
         return msg;
 
       },
 
       updataData(data,id){//输入框存值
 
@@ -127,7 +129,7 @@
 
           }
 
         }
 
         this.$store.commit('setDatas',{type:moduleCP['diagT'],data:data,pId:data.id,ppId:id});
 
-        this.$store.commit('setText',{type:moduleCP['diagT'],text:data.value,pId:data.id,flag:true}); 
+        this.$store.commit('setText',{type:moduleCP['diagT'],text:data.value.replace(patt,'').replace(/\#\{/g,'').replace(/\}/g,''),textP:data.valueP.replace(patt,'').replace(/\#\{/g,'').replace(/\}/g,''),pId:data.id,flag:true}); 
       }
 
     },
 
     components:{

+ 5 - 5
src/components/Others.vue
Просмотреть файл 

@@ -4,7 +4,7 @@
 
         v-if="dtoList"
 
         :key="it.id"
 
         class="label">
 
-        <p class="quest">{{i + 1 +'.' + it.name}}</p>
 
+        <p class="quest">{{i + 1 +'.' + (it.description||it.name)}}</p>
 
         <!-- <Label v-if="it.controlType==0" -->
 
         <Label v-if="it.controlType==0"
 
               :item="it"
 
@@ -70,7 +70,7 @@
 
   import Toast from '../common/Toast.vue';
 
   import Input from '../common/Input.vue';
 
   import ComTextArea from '../common/ComTextArea.vue';
 
-  import {moduleCP} from '@utils/tools';
 
+  import {moduleCP,patt} from '@utils/tools';
 
   import Radio from '../common/Radio.vue';
 
   import CheckBox from '../common/CheckBox.vue';
 
   import MultiLineInput from '../common/MultiLineInput.vue';
 
@@ -128,14 +128,14 @@
 
         
         // this.$store.commit('setOrigin',{type:'3',data:data,pId:data.id});
 
         this.$store.commit('setDatas',{type:moduleCP['other'],data:data,pId:data.id,ppId:id});
 
-        this.$store.commit('setText',{type:moduleCP['other'],text:data.value,pId:data.id,flag:true}); 
+        this.$store.commit('setText',{type:moduleCP['other'],text:data.value.replace(patt,'').replace(/\#\{/g,'').replace(/\}/g,''),textP:data.valueP.replace(patt,'').replace(/\#\{/g,'').replace(/\}/g,''),pId:data.id,flag:true}); 
       },
 
       getText(){
 
         let textArr = this.checkText;
 
         let msg = "";
 
         for(let k in textArr){
 
-          if(textArr[k].text){
 
-            msg += textArr[k].text + '；'
 
+          if(textArr[k].textP){
 
+            msg += textArr[k].textP + '；'
 
           }          
         }
 
         return msg;

+ 23 - 25
src/components/Preview.vue
Просмотреть файл 

@@ -69,7 +69,7 @@
 
       :showType="showType"
 
       @showSubmit="showSubmit"
 
     ></Submit>
 
-    <Loading v-if="show"></Loading>
 
+    <Loading v-if="loadingShow"></Loading>
 
   </div>
 
 </template>
 
 <script>
 
@@ -78,9 +78,9 @@ import Submit from '../common/Submit';
 
 import Loading from '../common/Loading';
 
 import {moduleCP} from '@utils/tools.js'
 
 export default {
 
-  props: ['preName','showLis'],
 
+  props: ['preName','showLis','loadingShow'],
 
   data() {
 
-    const { pathInfo, originDatas } = this.$store.state;
 
+    const { pathInfo, originDatas,loadingShow } = this.$store.state;
 
     let symptomDate = this.$store.state.symptom;
 
     let diagnoseDate = this.$store.state.diagnose;
 
     let othersDate = this.$store.state.others;
 
@@ -95,7 +95,7 @@ export default {
 
       submit: false,
 
       showType: 'fail',
 
       imgList:[],
 
-      show:false,//提交等待的动画loading
 
+      // show:loadingShow,//提交等待的动画loading
 
       tmpNum:0,
 
       moduleCP:moduleCP
 
     }
 
@@ -113,7 +113,7 @@ export default {
 
       // let tmpNum = this.tmpNum;
 
       // var dateBegin = new Date();//获取当前时间
 
       if (imgList.length > 0) {//有图片先上传图片
 
-        this.show = true
 
+        this.$store.commit('handleToggleShow', true);
 
         for (let i = 0; i < imgList.length; i++) {
 
           let pageFile = imgList[i].file
 
           formData.append('upfiles', imgList[i].file);
 
@@ -128,7 +128,6 @@ export default {
 
           //       var dateEnd = new Date();//获取当前时间
 
           //       var dateDiff = dateEnd.getTime() - dateBegin.getTime();//时间差的毫秒数
 
           //       var dayDiff = dateDiff / 1000;//计算出秒数
 
-          //       this.show = false
 
           //       alert('图片上传完成:'+dayDiff+'s')
 
           //     }
 
           //   }
 
@@ -136,7 +135,6 @@ export default {
 
         }
 
         // return
 
         api.uploadImageThums(formData).then((res) => {//获取图片
 
-          console.log(res.data)
 
           let result = res.data;
 
           if (result.code == 0) {//图片提交成功再保存数据
 
             // this.showType = 'success'
 
@@ -156,22 +154,17 @@ export default {
 
                 // var dateEnd = new Date();//获取当前时间
 
                 // var dateDiff = dateEnd.getTime() - dateBegin.getTime();//时间差的毫秒数
 
                 // var dayDiff = dateDiff / 1000;//计算出秒数
 
-                // this.show = false
 
                 // alert('图片上传完成:'+dayDiff+'s')
 
             this.saveAllDate()
 
           } else {//提交失败提示
 
-            this.show=false
 
-            this.showType = 'fail'
 
-            this.submit = true
 
-            let timer = setTimeout(() => {
 
-              this.submit = false
 
-              clearTimeout(timer)
 
-            }, 2000);
 
+            this.defaultWaring()
 
           }
 
+        }).catch((err)=>{
 
+          this.defaultWaring()
 
         })
 
         return;
 
       } else {//没有图片直接保存数据
 
-        this.show = true
 
+        this.$store.commit('handleToggleShow', true);
 
         this.saveAllDate()
 
       }
 
     },
 
@@ -233,19 +226,24 @@ export default {
 
       api.saveInquiry(params).then((res) => {
 
         console.log(res)
 
         if (res.data.code == 0) {
 
-          this.show=false
 
+          this.$store.commit('handleToggleShow', false);
 
           this.showType = 'success'
 
           this.submit = true
 
         } else {
 
-          this.show=false
 
-          this.showType = 'fail'
 
-          this.submit = true
 
-          let timer = setTimeout(() => {
 
-            this.submit = false
 
-            clearTimeout(timer)
 
-          }, 2000);
 
+          this.defaultWaring()
 
         }
 
-      })
 
+      }).catch((err)=>{
 
+          this.defaultWaring()
 
+        })
 
+    },
 
+    defaultWaring(){
 
+      this.$store.commit('handleToggleShow', false);
 
+      this.showType = 'fail'
 
+      this.submit = true
 
+      let timer = setTimeout(() => {
 
+        this.submit = false
 
+        clearTimeout(timer)
 
+      }, 2000);
 
     }
 
   },
 
   components: {

+ 2 - 2
src/components/Symptom.vue
Просмотреть файл 

@@ -35,7 +35,7 @@
 
       v-if="checkText.length>0"
 
     >
 
       <p class="title">{{nameStr}}</p>
 
-      <p v-for="(value,index) in checkText">{{value.text}}</p>
 
+      <p v-for="(value,index) in checkText">{{value.textP}}</p>
 
     </div>
 
     <div v-if="modluesLen>1"
 
       :class="['footer',{'nofoot':chooseSymp.length==0}]"
 
@@ -153,7 +153,7 @@ export default {
 
       this.questId = item.questionId || item.id || item.conceptId;
 
       const id = item.questionId || item.id; //常见症状questionId，推送id,两者均有可能没有
 
       //将选中的name存到store中的text
 
-      this.$store.commit('setText', { type: moduleCP['symp'], text: item.name, pId: this.questId });
 
+      this.$store.commit('setText', { type: moduleCP['symp'], text: item.name,textP: item.name, pId: this.questId });
 
       if (id) {
 
         const param = {
 
           "age": this.age,

+ 3 - 2
src/components/TabPage.vue
Просмотреть файл 

@@ -51,8 +51,9 @@
 
           @back="beBack"
 
         />
 
       </template>
 
-      <Preview v-show="!moduleShow" 
+      <Preview v-if="!moduleShow" 
         :preName="getPreviewName()"
 
+        :loadingShow="this.$store.state.loadingShow"
 
         :showLis="type"
 
         @back="beBack" 
       />
 
@@ -91,7 +92,7 @@ export default {
 
         '52':false
 
       },
 
       number:0,
 
-      moduleCP:moduleCP
 
+      moduleCP:moduleCP,
 
     }
 
   },
 
   created() {

+ 5 - 1
src/store.js
Просмотреть файл 

@@ -31,7 +31,8 @@ const store = new Vuex.Store({
 
     addContent:{
 
       origin:[],
 
       txt:'',
 
-    }
 
+    },
 
+    loadingShow:false
 
   },
 
   mutations:{
 
     initAllData(state){
 
@@ -363,6 +364,9 @@ const store = new Vuex.Store({
 
       }
 
       
     },
 
+    handleToggleShow(state,flg){
 
+      state.loadingShow = flg
 
+    }
 
   }
 
 })

+ 7 - 5
src/utils/tools.js
Просмотреть файл 

@@ -103,17 +103,21 @@ const getModelExpStr = (str,txt) =>{
 
   return result
 
 }
 
 
+// 替换输入框占位符
 
+const patt = /\$\{[^\]]+\}/g;
 
+
 
 const getAllStr = (allData) =>{//获取界面数据，拼接字符串
 
-  let allStr = '',data = allData.data;
 
+  let allStr = '',data = allData.data;console.log(555,data)
 
   for(let i = 0;i < data.length;i++){
 
     if(data[i].controlType != 3&&data[i].value){
 
-        allStr += (data[i].value).replace('{','').replace('}','')+';'
 
+        // allStr += (data[i].value).replace('{','').replace('}','')+';'
 
+        allStr += (data[i].value).replace(patt,'').replace(/\#\{/g,'').replace(/\}/g,'')+';'
 
     }
 
     if(data[i].controlType == 3){//多列选择
 
       let tmpStr = '';
 
       for(let j = 0;j < data[i].questionDetailList.length;j++){
 
         let tmpName = data[i].questionDetailList[j]
 
-        if(tmpName&&tmpName.value){
 
+        if(tmpName&&tmpName.value&&tmpName.value!='/'){
 
           let obj = getModelExpStr(tmpName.name)
 
           tmpStr+=obj.prefix+tmpName.value+obj.suffix+(j ==(data[i].questionDetailList.length-1)?';':',')
 
         }
 
@@ -156,8 +160,6 @@ const moduleConfig = (config,modules) => {
 
   }
 
 }
 
 
-// 替换输入框占位符
 
-const patt = /\$\{[^\]]+\}/g;
 
 
 // 监听键盘是否弹起
 
 function fixedKeyboard() {