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

src/common/Label.vue

@@ -12,6 +12,7 @@
 </template>
 <script type="text/javascript">
 import Toast from '../common/Toast.vue';
+import {moduleCP} from '@utils/tools';
   export default{
     name:'Label',
     data(){
@@ -79,9 +80,9 @@ import Toast from '../common/Toast.vue';
         const temp = this.tempItem;
         // 从store中取origin的值
         let origin,newItem;
-        if(this.moduleType==2){
+        if(this.moduleType==moduleCP['diagT']){
           origin = this.$store.state.diagnose.origin
-        }else if(this.moduleType == 3){
+        }else if(this.moduleType == moduleCP['other']){
           origin = this.$store.state.others.origin
         }
         if(origin){

src/components/AddContent.vue

@@ -47,7 +47,7 @@
     </div>
     <div class="foot">
       <span class="back" @click="back">{{'返回'+ preName}}</span>
-      <span class="next" @click="next">预览</span>
+      <span class="next" @click="next">预览并提交病例</span>
     </div>
   </div>
 </template>

src/components/DetailBox.vue

@@ -99,10 +99,12 @@
       color: #7C828E;
       i{
         position: absolute;
-        top:0.35rem;
+        top:0.64rem;
         left:0;
         font-size: .22rem;
         width:100%;
+        height: .33rem;
+        line-height: .33rem;
         display: inline-block;
         text-align: center;
       }

src/components/DiagTreat.vue

@@ -36,7 +36,7 @@
             @updata="updataData($event,it.id)"/>
     </div>
     <div class="result" v-if="checkText.length>0">
-      <p class="title">治疗情况</p>
+      <p class="title">{{datas.name}}</p>
       <!-- <p v-for="(v,i) in checkText">{{v.text}}</p> -->
       <p>{{getText()}}</p>
     </div>

src/components/Others.vue

@@ -42,7 +42,7 @@
         </template> -->
     </div>
     <div class="result" v-if="checkText.length>0">
-      <p class="title">其他病史</p>
+      <p class="title">{{datas.name}}</p>
       <p>{{getText()}}</p>
     </div>
     <div class="foot" v-if="modluesLen==3&&!nextName||modluesLen==2">

src/components/Preview.vue

@@ -17,13 +17,15 @@
     </div>
     <div class="personMsg">
       <ul class="previewParts">
-        <li v-if="symptom.choose.length>0">
+        <!-- <li v-if="symptom.choose.length>0"> -->
+        <li>
           <h4><i :style="{'background': '#FF9A9A'}"></i> 主诉：</h4>
           <p>
             <span v-for="(item,idx) in symptom.choose" :key="item.name+idx">{{item.name+(idx == symptom.choose.length-1?'':'、')}}</span>
           </p>
         </li>
-        <li v-if="diagnose.text.length>0||symptom.choose.length>0">
+        <!-- <li v-if="diagnose.text.length>0||symptom.choose.length>0"> -->
+        <li>
           <h4><i :style="{'background': '#3D69D9'}"></i> 现病史：</h4>
           <p>
             <span v-for="(item,idx) in symptom.text" :key="item.text+idx">{{item.text+(idx == symptom.choose.length-1?'。':';')}}</span>
@@ -32,13 +34,13 @@
             <span v-for="(item,idx) in diagnose.text" :key="item.text+idx">{{item.text+(idx == diagnose.text.length-1?'。':';')}}</span>
           </p>
         </li>
-        <li v-if="others.text.length>0">
+        <li v-if="showLis[moduleCP['other']]==1">
           <h4><i></i> 其他史：</h4>
           <p>
             <span v-for="(item,idx) in others.text" :key="item.text+idx">{{item.text+(idx == others.text.length-1?'。':';')}}</span>
           </p>
         </li>
-        <li v-if="addContent.txt">
+        <li v-if="showLis[moduleCP['suplement']]==1">
           <h4><i></i> 补充内容：</h4>
           <p>{{addContent.txt}}</p>
         </li>
@@ -72,8 +74,9 @@
 import api from '@utils/api.js';
 import Submit from '../common/Submit';
 import Loading from '../common/Loading';
+import {moduleCP} from '@utils/tools.js'
 export default {
-  props: ['preName'],
+  props: ['preName','showLis'],
   data() {
     const { pathInfo, originDatas } = this.$store.state;
     let symptomDate = this.$store.state.symptom;
@@ -91,7 +94,8 @@ export default {
       showType: 'fail',
       imgList:[],
       show:false,//提交等待的动画loading
-      tmpNum:0
+      tmpNum:0,
+      moduleCP:moduleCP
     }
   },
   methods: {

src/components/Symptom.vue

@@ -34,7 +34,7 @@
       class="result"
       v-if="checkText.length>0"
     >
-      <p class="title">症状情况</p>
+      <p class="title">{{nameStr}}</p>
       <p v-for="(value,index) in checkText">{{value.text}}</p>
     </div>
     <div v-if="modluesLen>1"
@@ -82,7 +82,7 @@ import Search from './Search.vue';
 import {moduleCP} from '@utils/tools'
 export default {
   name: 'Symptom',
-  props:['modluesLen'],
+  props:['modluesLen','nameStr'],
   data() {
     let { datas, pathInfo } = this.$store.state;
     const { choose, text } = this.$store.state.symptom;

src/components/TabPage.vue

@@ -18,6 +18,7 @@
         <Symptom
           v-if="flag==moduleCP['symp']&&item.type==moduleCP['symp']&&moduleShow"
           @next="toNext"
+          :nameStr="item.name"
           :modluesLen="modluesLen"
         />
       
@@ -52,6 +53,7 @@
       </template>
       <Preview v-show="!moduleShow" 
         :preName="getPreviewName()"
+        :showLis="type"
         @back="beBack" 
       />
     </div>

src/utils/tools.js

@@ -16,7 +16,7 @@ const deepClone = (arr) =>{
   }
   return newArr;
 }
-// 带输入框选项
+
 const getExpStr = (str) =>{
   let result = {}
   if(str.match(/\${number_(.*})/)){//数字输入框