Jelajahi Sumber

合并test分支
Squashed commit of the following:

commit 156fb3fe787debf99635c781e4e1f16cac7b92cd
Merge: a090507 ed34230
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Apr 4 12:17:20 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into test

commit ed3423096617981325dcae066cd431507ed596f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Apr 4 11:23:35 2019 +0800

parseInt改为parseFloat

commit c2e54613a7b5c95a1641c407dc1e86de5765aa59
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Apr 4 10:30:07 2019 +0800

修改常见症状类型

commit 0aebc4dd1a295140290cc3c12e140f58234f7f91
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Apr 4 09:22:30 2019 +0800

医学术语属性维护

commit a0905078d59dccb48aaaab041eb66fd463680a89
Merge: 2dd155c dbd9460
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Apr 3 15:51:17 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit 2dd155cdd07b7c87e4e277c85e3128e75bdc61a6
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Apr 3 15:51:06 2019 +0800

地址修改

commit dbd9460632afbbd7bf235e1381ee201c7b8a5645
Author: Luolei <16657115156@163.com>
Date: Wed Apr 3 11:17:59 2019 +0800

去重

commit 781ba78df967509a63f087023bbed56bcdd69294
Merge: 81bd3da 058305c
Author: Luolei <16657115156@163.com>
Date: Wed Apr 3 11:11:43 2019 +0800

Merge branch 'dev2/luolei' into test

commit 058305c7d97a7e5bdc699bb5ac0a2ce129e6cd65
Merge: eae3853 3d818c0
Author: Luolei <16657115156@163.com>
Date: Wed Apr 3 11:00:09 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit eae385332573cc0b2ee4c79e6ef54932994b1931
Merge: 5355c53 381cec3
Author: Luolei <16657115156@163.com>
Date: Wed Apr 3 10:57:52 2019 +0800

Merge branch 'dev' into dev2/luolei

commit 81bd3da4e6c9dcef21f724cf9f7d5bb823c0c1f3
Merge: 305f36f 3d818c0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Apr 3 10:52:36 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 5355c53799b35d358202e3f7dc6ef15810e70277
Author: Luolei <16657115156@163.com>
Date: Wed Apr 3 10:49:37 2019 +0800

模板bug修改

commit 305f36fc4d5f08ca6d1758e8c0d05fb1edbeee89
Merge: c6805c8 5f45d60
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Apr 3 10:09:33 2019 +0800

Merge branch 'independentTag' into test

commit 3d818c02a44b844bebaa308f9f434839daa010a7
Merge: 2d9d178 381cec3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Apr 3 10:09:12 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 381cec3d07b369019475e22fdcfeae2892552bd9
Merge: c6805c8 5f45d60
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Apr 3 10:08:31 2019 +0800

Merge branch 'independentTag' into dev

commit 2d9d17892d7f9b52f48356e329a9cad6e377603b
Merge: 85942ae c6805c8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Apr 3 10:05:35 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 85942aedd3afc2c4915fe2c646c5eb792214bec5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Apr 3 10:04:01 2019 +0800

修改bug(727, 836)

commit 4fa3740e6e65a4158f02fbf183b89520f04d3fa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Apr 3 09:49:09 2019 +0800

医学术语维护

commit c6805c8ccacc31b481d995a8e63081d9ac73f960
Author: Luolei <16657115156@163.com>
Date: Tue Apr 2 19:13:09 2019 +0800

提示语改变,禁用删除

commit 5f45d604b845d262606b704d4edbae8acd2fba40
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Apr 2 16:35:58 2019 +0800

段落必填验证

commit ef7b715ef47140a08f682eb7e14e48bb10231616
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Apr 2 16:28:55 2019 +0800

弹窗取消按钮样式修改

commit 9dfbede65b7e29bd0b3a243e9f35d7d5fd196213
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Apr 2 16:22:47 2019 +0800

术语静态知识对接完成

commit acf1fa716b0419cf6cd7e307b9f78d7b94debd3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Apr 2 14:44:35 2019 +0800

添加查体模板时标签池不能为空

commit e331cf1a9803058563e1cb8b1865c599deee0934
Merge: cd653c3 05f8b0e
Author: Luolei <16657115156@163.com>
Date: Tue Apr 2 14:08:43 2019 +0800

Merge branch 'dev2/luolei' into test

commit 05f8b0ee1815693d5cb195b81c18f1ef3cfd5919
Author: Luolei <16657115156@163.com>
Date: Tue Apr 2 14:08:00 2019 +0800

模板打标

commit cd653c3d6a6fe11f046695e457dffb0815e2fa81
Merge: b3f4e7d 8ed7c6a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Apr 2 10:20:50 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

commit 8ed7c6a2d29d1bcb7869e316bb85894080b451d1
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Apr 2 10:17:15 2019 +0800

提示信息添加修改bug修改

commit 2df9a8bcd0845a5af493a0dfc4f43c2d1a49e167
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Apr 2 09:50:28 2019 +0800

修改常见症状科室和类型选择顺序

commit dd797db09dc82fb8293e415371613c3598918521
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Apr 1 20:35:13 2019 +0800

富文本服务器地址修改

commit 2d54175172f359e9667916b5732b5facbae9a5cc
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Apr 1 20:24:27 2019 +0800

静态知识修改接口对接

commit 8f0d7507a94d369a74b5bf958335cc2406e7ab43
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Apr 1 17:39:58 2019 +0800

静态知识样式修改,修改时传id

commit 2107dc14bca4a12dc31c46c8fcfce69978b21041
Merge: 60bdf51 6eb5042
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Apr 1 17:15:14 2019 +0800

Merge branch 'dev' into independentTag

commit b3f4e7d1ee98666b339f6f2cf63811e2c0d03009
Merge: e99a4c4 e843e63
Author: Luolei <16657115156@163.com>
Date: Mon Apr 1 15:56:02 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit e99a4c4dbcaad70905c68be4a6b0c78f6c778861
Merge: 60a0b37 f928587
Author: Luolei <16657115156@163.com>
Date: Mon Apr 1 15:53:39 2019 +0800

Merge branch 'dev2/luolei' into dev

commit f928587957a0b01977253254048c478bb40a3a59
Author: Luolei <16657115156@163.com>
Date: Mon Apr 1 15:51:38 2019 +0800

模板维护修改

commit e843e63dbe654f8a3fd947abe9005c31d60622a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Apr 1 14:38:15 2019 +0800

修改正常值范围提示

commit 776f81246104d894a203f5f703d386684ec32150
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 29 09:48:48 2019 +0800

修改常见症状标签保存

commit 60a0b37e428f1401370aca7359a43ba901de5661
Merge: dee801b 98e002f
Author: Luolei <16657115156@163.com>
Date: Fri Mar 29 09:07:03 2019 +0800

Merge branch 'depart' into dev

commit 5ca8535bc29d0927c9ee1a3d4f6d79259a294257
Author: Luolei <16657115156@163.com>
Date: Fri Mar 29 09:05:11 2019 +0800

模板维护未完成

commit 0451a04242eaf4b32ff8452e05ed737fbb1fb1d5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 28 19:11:40 2019 +0800

比较年龄大小转换为数字

commit ac9b8645514db2dbd7c94b0bd5eb767fb5bef843
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 28 18:39:03 2019 +0800

修改查体模板列表查询参数

commit dee801b98d85597b07f3ab8cf11b4f8c131c035d
Merge: a8b37e5 b1807bf
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 28 13:35:40 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit c4242c6ac8c498d9cc1b7502e368e395eaac3ed9
Author: Luolei <16657115156@163.com>
Date: Thu Mar 28 11:26:53 2019 +0800

添加输入栏不消失

commit a8b37e5183a050aae2dea0c07de6f406963ead1f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 28 10:19:52 2019 +0800

修改常见科室症状模板保存提示

commit b1807bfc49fbde296c88bc204da0d92ad46c649e
Merge: 50de039 6eb5042
Author: Luolei <16657115156@163.com>
Date: Thu Mar 28 09:19:43 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 50de039e322e3ac8f2465565c1454884e71dd895
Author: Luolei <16657115156@163.com>
Date: Thu Mar 28 09:19:34 2019 +0800

bug

commit 60bdf5130b772a539d01f5cba56178e0837db444
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 27 19:46:39 2019 +0800

提示修改

commit e47af094bf9db90dc53fdce65de26da731def7a6
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 27 19:46:16 2019 +0800

提示修改

commit 6eb5042a980affe1d996b75ef4592dcae9b74bbe
Merge: 63d0d4a 5cf4829
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 27 17:49:17 2019 +0800

Merge remote-tracking branch 'origin/depart' into dev

commit 63d0d4a270d2a94e40d269acbf92ecc84b8afe61
Merge: 1a4e85b 4eabe59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 27 17:47:24 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit 1a4e85bfd39ab7b2fdb5420ba3ca2521d2950aa5
Merge: 327a1e6 c3d1200
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 27 17:47:14 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

commit c3d1200f026e9107a3651c3e36a2d233ee1ef605
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 27 16:33:45 2019 +0800

修改多选同一选项可同伴同无bug

commit 327a1e6b662b2e15040893bccc6f32282060dcb2
Author: Luolei <16657115156@163.com>
Date: Wed Mar 27 10:02:01 2019 +0800

注释解开

commit 0359a0b18334a5cd843610d6b7080529a5ee5f44
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Mar 26 19:56:19 2019 +0800

标签明细文字显示bug修改

commit 04fdbebb794499122269a58a6625ef9cd814cf2c
Author: Luolei <16657115156@163.com>
Date: Tue Mar 26 19:07:13 2019 +0800

标记位置调整

commit 4eabe5976afb867c69ef76cc249d3b3e605cdce3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 26 19:01:34 2019 +0800

数字键盘+正常值范围

commit 48ce267308fdadc4263fb494562062e6c046b1ee
Author: Luolei <16657115156@163.com>
Date: Tue Mar 26 18:51:33 2019 +0800

模板添加标识

commit bf3e8423c37317f993d863e5c626f67378165b7f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 26 14:21:28 2019 +0800

查体模板标签池类型过滤

commit 5871bc0f85724a4cfd24600514cd7c89ae5574b9
Merge: 9716ebe e342822
Author: Luolei <16657115156@163.com>
Date: Tue Mar 26 11:30:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 9716ebea1f825797251b9c3dcf71461521b08756
Author: Luolei <16657115156@163.com>
Date: Tue Mar 26 11:30:11 2019 +0800

性别改变标签池没数据

commit e342822bb1e4ecc930e68365cde6c54bbd797110
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 26 11:03:23 2019 +0800

修改样式

commit 94e97250fb216ade0ceea65bd619bfd41a4edefd
Merge: 2b8a6c5 5036215
Author: Luolei <16657115156@163.com>
Date: Tue Mar 26 10:54:26 2019 +0800

Merge branch 'test' into dev

commit 50362153ae2c1dd598a194f6a557b97dbe529740
Merge: fc30441 ed838a4
Author: Luolei <16657115156@163.com>
Date: Tue Mar 26 10:53:57 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 2b8a6c52fa3e4cb32257937f1fa48a7cbd372089
Merge: fc30441 ed838a4
Author: Luolei <16657115156@163.com>
Date: Tue Mar 26 10:53:01 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit ed838a4fedfcab909ec13feec92b85e290bf016d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 26 10:33:49 2019 +0800

常见科室症状详情页面确定直接返回列表页

commit 6f75dfc9b8e9af1093d9c91d5d16052ebccd71e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 26 10:29:09 2019 +0800

常见科室症状和查体标签左右移动可连续移动

commit 538b304562f3b0d80adb4a3cc4bb6a618885127f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 26 10:22:54 2019 +0800

修改bug(689,693694,695,)

commit fc30441518f82c26aa10f2e54b6485da22a9217f
Author: Luolei <16657115156@163.com>
Date: Tue Mar 26 10:21:52 2019 +0800

杂音bug修改

commit 7670280d3a83a4f70ff0d9a24023abec9c9d68b2
Author: Luolei <16657115156@163.com>
Date: Mon Mar 25 14:08:35 2019 +0800

标签系统名称重复判断

commit 6e81a7847302afe008c5eff56ceae25fa4898c80
Merge: 9a61e23 cd4ae05
Author: Luolei <16657115156@163.com>
Date: Fri Mar 22 14:59:50 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 9a61e23ce80165893c99cfaf5826affe0295d8af
Merge: 805660c 87d792c
Author: Luolei <16657115156@163.com>
Date: Fri Mar 22 14:56:55 2019 +0800

Merge branch 'depart' into dev

commit 805660cff83be33fc9dbf79ae7d57eb95b46cfc9
Author: Luolei <16657115156@163.com>
Date: Fri Mar 22 14:44:02 2019 +0800

下载依赖

commit cd4ae0589bd4b37f4dfeec987e9aef27ee7d0296
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 22 14:22:36 2019 +0800

化验注释掉选项直接连接词(561)

commit 376a0bfacb4878d5631f4314c950ee1fa24e11a4
Merge: 8eff730 3acacf1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 22 14:07:55 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 8eff73025abd50ac8b4e3a2e7f67ff959e6caaf0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 22 14:05:10 2019 +0800

修改独立标签标签名称重复提示(614)

commit a0b6c7f2b88a90447a486641f9d907507b3866ca
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 22 13:34:21 2019 +0800

独立标签过滤掉填写单类型为默认值的选项

commit 3c3ad022eb5669f919b4c83747d1a2f89d7cbf6a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 22 13:29:51 2019 +0800

横铺统一(血压)类型标签明细不能为空

commit 4c08f78ef10d83caa61af39cd52dc83d91c34571
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 22 13:23:02 2019 +0800

独立标签列表筛选添加标签类型

commit 7a39afc56a8d938dc3fa52fb3d87e80a04381f34
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 22 11:50:54 2019 +0800

症状和血压类型添加填写单类型

commit 3acacf129130467ed1324dd9250e79ff3bc95537
Merge: c863ca3 8ff8fd9
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 22 11:33:02 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

# Conflicts:
# src/components/icss/AddIndeptLabel.vue

commit 8ff8fd916e5ac807872386dcfda6ad8482e1ad42
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 22 10:49:06 2019 +0800

术语静态知识删除用id

commit c863ca38aeb5e7d73daf1581988448c926de19b8
Author: Luolei <16657115156@163.com>
Date: Fri Mar 22 10:49:05 2019 +0800

化验类型和标签系统名称判断条件修改

commit 63eb94e12cac6fc8315738f2d0288f50ced8890d
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 21 19:02:16 2019 +0800

静态知识编辑禁用bug修改,富文本编辑器修改

commit 99641449bd1d354d8d6f280294ff1d951d243431
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 21 17:06:03 2019 +0800

术语类型列表不缓存

commit 5dfafcb491e18ee40fff33455520c7df90c213f9
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 21 17:05:37 2019 +0800

术语类型列表不缓存

commit 5ae4abd87b34dcf534dececd4ab860b93696f218
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 21 16:42:19 2019 +0800

术语静态知识术语列表接口对接修改,单选提示颜色修改

commit 2ccb9858e06e0867acd91740aef5da9783b3f500
Author: Luolei <16657115156@163.com>
Date: Thu Mar 21 15:13:25 2019 +0800

括号去掉

commit 0dcb8fef346c90938e1870c6f21e11a88b470c9b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 21 15:07:53 2019 +0800

删除多余项

commit ed81effdaca88f4e628d86d191a993fa0f3978cf
Merge: cf0de03 13a6dcb
Author: Luolei <16657115156@163.com>
Date: Thu Mar 21 15:02:35 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit cf0de03eb036a1bdb4df6a61149574c3f3f71549
Author: Luolei <16657115156@163.com>
Date: Thu Mar 21 15:01:09 2019 +0800

tagtype只能为4

commit 13a6dcb5f9b800de8ebb166d315e6506b1fda8d6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 21 14:51:37 2019 +0800

修改填写单类型清空明细

commit 7da99b0dc99026b4a24edb84d64694392bcd6ced
Merge: 5580e2a 5c67b84
Author: Luolei <16657115156@163.com>
Date: Thu Mar 21 14:32:42 2019 +0800

Merge branch 'dev' into dev2/luolei

commit 5580e2ab1a724ba2d68fdce38e72cdaa80c96076
Author: Luolei <16657115156@163.com>
Date: Thu Mar 21 14:31:36 2019 +0800

提示语位置内容修改

commit 4251a392b7aadf29c78bcca26593caa17c2d8f38
Merge: 5868db0 a4deccc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 21 13:25:45 2019 +0800

Merge branch 'dev' into independentTag

# Conflicts:
# src/api/config.js
# src/components/icss/AddIndeptLabel.vue

commit 71962fce3c89383109eb3f834583273cb1ba83a9
Author: Luolei <16657115156@163.com>
Date: Thu Mar 21 13:23:15 2019 +0800

既往史记提示语

commit 5c67b84bf18cda78d7821e36474448e3fc063244
Merge: 0f3efa2 614834f
Author: Luolei <16657115156@163.com>
Date: Thu Mar 21 12:26:43 2019 +0800

Merge branch 'depart' into dev

commit 5868db03baa7091f031e19f5d02aeef9816119db
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 21 11:57:21 2019 +0800

多选所有选项必须都有或者都没有同“伴”/“无”标记

commit 0f3efa296c99f66a548efa6d8005e708dccbf039
Author: Luolei <16657115156@163.com>
Date: Thu Mar 21 11:47:53 2019 +0800

既往史条件限制

commit 15eedd558dbe60d4ee1097d50661c4bbcd6cecd4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 21 09:53:12 2019 +0800

独立标签注释掉能否当检索项

commit 01333879369a37feda57c84df81f3342486cf3eb
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 20 17:14:16 2019 +0800

术语静态知识修改来源赋值

commit 07e19b6fd1e045d577c04ffe2d4ba790dc8245f7
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 20 16:46:27 2019 +0800

术语静态知识对接

commit 694911562dd772f082e19ad438b842c19cfc4a76
Merge: cf66c47 ecbbace
Author: Luolei <16657115156@163.com>
Date: Wed Mar 20 15:46:02 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit cf66c47fa69c014a9cd646692b830ae388144a09
Author: Luolei <16657115156@163.com>
Date: Wed Mar 20 15:45:48 2019 +0800

既往史bug

commit f59c718fdfffa50e91e2e2d77545a35a4a61ed14
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 20 15:33:59 2019 +0800

术语静态知识对接删除

commit ecbbace49098596c966115301d595ce18e169dc0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 20 15:19:50 2019 +0800

删除多余项

commit fb673bbc05cd05b65640e7260baa8cfd50524400
Merge: 8c38321 48afc9f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 20 15:18:40 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 8c383213e4629b558e69d83ad0221b0b2d7860da
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 20 15:17:34 2019 +0800

修改初始化为是否为症状的值

commit 48afc9ff25b2ee2a3b27491c8bccb62198a49501
Merge: 8f62ecf fb5ec6b
Author: Luolei <16657115156@163.com>
Date: Wed Mar 20 13:23:37 2019 +0800

Merge branch 'dev2/luolei' into dev

commit fb5ec6bfa7930b730b144f9564e2cca641c2317c
Author: Luolei <16657115156@163.com>
Date: Wed Mar 20 13:22:44 2019 +0800

destroy不生效

commit 7d81835e065ecae44212d00e6674dcf9bdf761e8
Author: Luolei <16657115156@163.com>
Date: Wed Mar 20 11:50:27 2019 +0800

既往史限制条件改变

commit ca12a7080695238f83c919e31dd3dad2b0905897
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 20 11:45:56 2019 +0800

添加术语类型接口对接

commit 8f62ecf467c2368b5b3c94708bdb1a0cf73e960f
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 20 11:00:11 2019 +0800

Squashed commit of the following:

commit d26fdd69ea7336100bbd8706d30d660286fd0385
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 20 10:52:01 2019 +0800

别名维护导入提示信息修改

commit 614834f38462e0c26b3ae7533d7072ad9ea7bcbd
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 19 15:23:15 2019 +0800

Squashed commit of the following:

commit a39882fb598ad90451fbfd224b6891a7435bf52b
Merge: eb9514a 9598d94
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 09:41:27 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 9598d94c53b73cb3df116180f76c2c1748d922e6
Merge: 621f140 a34c487
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 09:38:59 2019 +0800

Merge branch 'independentTag' into dev2/luolei

commit 621f1403ff1d937760d1dbac7a51285c21d2413a
Merge: 8c21876 019bf02
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 09:27:59 2019 +0800

Merge branch 'depart' into dev2/luolei

commit eb9514adcd6ca8b5c994e62fdc599edecc35d28b
Merge: 339757e b09082a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:41:04 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit 339757e6ffe47a70ea5b70ef9a6cbc9c6ac588f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:40:24 2019 +0800

修改填写单类型初始化非公共数据

commit c2bccce8a4757c593c46d168dbb56464f6f59825
Merge: 5f05a09 8c21876
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:34:05 2019 +0800

merge from 'dev'

commit 5f05a0901e939d421dd3dfe3bf33237b6a61ef10
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:28:34 2019 +0800

修改填写单类型,初始化非公用数据

commit b09082a5947c02980bccd544de54dc035958c3a5
Merge: 0c683ce 8c21876
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 17:27:25 2019 +0800

Merge branch 'dev' into test

commit 8c21876bee94cef3d8485d7c58a01e58d992ef80
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 17:23:46 2019 +0800

既往史toleft加判断

commit 2e06ad10f877fc0fd18ed1a40866096c01cf1314
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 16:52:41 2019 +0800

增加是否为症状

commit e056b1acc3a1161dbcc7f2b2f84a0fec4d702673
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 16:52:21 2019 +0800

增加是否为症状

commit 5b24bee80e9e7c105514218ae06b8210c9068fcf
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 16:51:42 2019 +0800

填写单类型判断bug

commit fa4b3e51bcbed84646fa2aeaf1b26a165c444e18
Merge: 95b977d 238b7a0
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 16:32:14 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 95b977da112d0c456abb8604dc287f6a92236809
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 16:32:00 2019 +0800

既往史修改

commit a34c4875dd8de5a58fbcf1d682d5b682e815b21f
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 18 15:39:52 2019 +0800

术语静态知识未完

commit 22bf16a5ab5b0dfbda03ffc078ffb9c1f865a28d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 15:12:56 2019 +0800

添加独立标签标签明细限制30个字

commit 71b2b268d6dffa536ce4a2bbb908410935854bbb
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 18 09:55:42 2019 +0800

独立标签列表显示类型bug修改

commit 0c683ce6d2a9124e8407c03bf849e012ef0bd641
Merge: 3af8ef7 238b7a0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:05:34 2019 +0800

Merge remote-tracking branch 'origin/dev' into test

commit 238b7a09cfd44561122001f946d9f7c43cbea945
Merge: 6b41a18 30f21b9
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:04:16 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit 6b41a18eedcdba1bc7a3444b19d64b310fa1a52b
Merge: 2b6eb62 2ca1fb2
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:04:11 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

commit 2b6eb62b7d560ad106f2e62e9b831f4ee01f6f9b
Merge: c93337c 1040e80
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:04:06 2019 +0800

Merge remote-tracking branch 'origin/depart' into dev

commit 30f21b92e4216e86e10df1c210f94949fe34a028
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 15 16:48:35 2019 +0800

独立标签单选多选去除空数据

commit 2ca1fb28c4f90f4ce45918ebdfcbc945fbc2ef06
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 16:46:26 2019 +0800

单选多选空选项过滤

commit 32f57b4df37b134f5ce926283617129da6f57822
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 16:19:57 2019 +0800

无控制台时默认页面不请求数据bug修改

commit a6b4df99023aa6ed9ca479a2e5dcfdff2f2dd390
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 14:59:21 2019 +0800

无控制台时默认页面不请求数据

commit c93337c2660faae3bcb7a341a28483b9e9880c2a
Merge: f3bf75a 1f970e0
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:42:25 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 3af8ef787a0fef6747c9a2dbbc1a0a06a230326a
Merge: 596e1f0 1f970e0
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:39:51 2019 +0800

Merge branch 'dev2/luolei' into test

commit 0ce01a9ceb8de1ac832df54615e7ede068e50657
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 15 13:38:52 2019 +0800

独立标签和标签组修改参数修改

commit 1f970e06ce073c126bc0a16cde614aac3dc08063
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:36:00 2019 +0800

配置文件改动

commit e0611ffef509322090d66dff6f48e78b9ad2e3c9
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:10:00 2019 +0800

bug

commit cbdb0771d38a2f2fc9f7cde87aa3ee6fc736bf47
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 11:19:44 2019 +0800

同无同伴可有多个选项,未选中行禁用按钮

commit 596e1f06cd5cfa1f53704611de405dcac15cd608
Merge: 080d5ee f3bf75a
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:41:51 2019 +0800

Merge remote-tracking branch 'origin/dev' into test

commit f3bf75aca37ff49a32bd70492ad7925be1fc07ec
Merge: 8983bf8 b5d0868
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:39:33 2019 +0800

Merge remote-tracking branch 'origin/depart' into dev

commit 8983bf86f32b0b938f78869bf8cdfadd1877fb0f
Merge: 8c43a86 2639ce7
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:35:35 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

# Conflicts:
# src/api/config.js

commit 8c43a86bfa08ee8abfce581d40a4d1b003912a22
Merge: dfcada3 3981702
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:33:47 2019 +0800

Merge remote-tracking branch 'origin/dev2/luolei' into dev

# Conflicts:
# src/api/config.js

commit dfcada342de93cad1b2e79cbcb5f09afab6f3c3b
Merge: 37d1343 1309a48
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:31:40 2019 +0800

Merge remote-tracking branch 'origin/depart' into dev

# Conflicts:
# src/api/config.js
# src/api/icss.js
# src/components/icss/AddDisclInfo.vue
# src/components/icss/AddMedicinePrompt.vue
# src/components/icss/CommonTemplate.vue
# src/components/icss/IndeptLabel.vue
# src/components/icss/MedicinePrompt.vue
# src/components/icss/PubTemplateGroup.vue
# src/components/icss/TemplateMaintenance.vue
# src/components/icss/TemplateMaintenanceWrap.vue
# src/routes.js

commit 37d1343525323228f3f5f857217daf62196ea729
Merge: 326491e 381645f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:14:37 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

commit 13f7f467645c0644b69308242e22f6510d5abfe0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 14 20:31:17 2019 +0800

增加最小年龄不能小于最大年龄判断

commit 3981702a621519f1d0b3ad497b40c0609310aab8
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 16:59:56 2019 +0800

操作人参数去错了

commit e82348bbfcca495fb9b438bd9a1ed3df4e0438f8
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 16:17:44 2019 +0800

参数调整

commit e52e7358c9b2f2ff0dda98f022f30e1e0208cf77
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 13:56:08 2019 +0800

模板维护基本完成

commit 381645fa24247459dbe2c9dfa27ab102631e63aa
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 14 13:26:13 2019 +0800

保存术语静态知识接口未完

commit 326491e11f514415af550bb36ab4a6e9b961b07f
Merge: 9d8e78e 3a35d38
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 11:23:08 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 080d5ee96746c135b8448580f490c9e7945ec511
Merge: 3a35d38 9d8e78e
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 11:20:37 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 3a35d38517110be2ff2fb9c216d38d800cc3757d
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 11:18:43 2019 +0800

模板维护功能提交

commit 2639ce711923bf4ef2c9c6dd06a515b504704748
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 14 10:51:22 2019 +0800

常见症状详情和修改

commit e39088b6d35790033d7d24ec444e9c2f8c05c92c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 16:46:33 2019 +0800

修改标签池标签类型

commit 9d8e78e5c7915fca2d57588e2fc7de5c3f5b737c
Merge: 581d3ec 7c4e0c7
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 15:43:00 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

# Conflicts:
# src/components/icss/IndeptLabel.vue
# src/components/icss/SingleSelect.vue

commit 7c4e0c7c2759ce35aba20392f2ddf8a0a5959ca2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 15:35:49 2019 +0800

常见科室症状

commit ea0f58d9620813f41d86db07b3b423593889e890
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 15:35:21 2019 +0800

多选取消默认选中

commit 581d3eca1b25e0a4ce75d638291ba0c5a94b6e35
Merge: ddc468f cdc557d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 15:30:08 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

# Conflicts:
# src/api/config.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/PromptInfo.vue
# src/routes.js

commit cdc557d0eee2af3a58aa67bfece53cbf32c343bd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 14:54:48 2019 +0800

独立标签表格标签类型显示修改,既往史添加标签池可选类型修改

commit 44fab27447641937bfa3f934e259ddc9f9b760cf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 14:20:04 2019 +0800

症状尾巴标签池有时间单位

commit d5a9d0b0cdf2976a1d50ff484ecb5c7f6843ef66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 13:55:39 2019 +0800

下拉组件清空与下拉箭头重合修改

commit feb792b515c554af8dde2a06127d3758b2b583eb
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 13:22:48 2019 +0800

独立标签筛选类型辅捡等不显示

commit c3a666aa1af0b9c561eaa5ed589effe614e985a5
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 11:43:37 2019 +0800

后台数据typeCn转换为筛选中对应的字段名称

commit efb80b4bf9e9d8aa6298b72f8b864a671edea2b7
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 11:21:29 2019 +0800

单选无同伴同无,多选无默认选中

commit b138d164f421524e7c66ee8673102d4738078b6e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 10:06:55 2019 +0800

术语静态知识未完

commit f0659f14489821e423f9c70564969af5edf2da2b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 09:16:02 2019 +0800

其他史多选的不需要显示默认选中

commit 592302ac839e01e17286f332cee2cafda9d82d78
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:50:27 2019 +0800

修改v-show为v-if

commit cb868f04f62ef05bbf2fd5038a71845a79ba75e0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:50:05 2019 +0800

血压修改问题

commit a2aa1c103fb35c7f788fe3499b22695898a1a99a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:49:37 2019 +0800

症状修改文字标签添加标识

commit ecdfcb194300b3b88f194a5a00c19aa474c7da34
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Mar 12 10:48:55 2019 +0800

医学术语静态知识维护页面添加

commit 5fb0d31284c1ea9f980ed42ee4ec0ea6e137e851
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Mar 12 10:23:29 2019 +0800

提示信息修改

commit 27e21af25e41e49ad609a06fb46157f2b635922c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 20:32:19 2019 +0800

静态知识修改

commit c4701778218a01ab699ed29be3402cc68b9ef5da
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:27:44 2019 +0800

单选异常选项修改

commit 822df8507b0c48b06e8d9b9350001cfd1f85765e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:11:18 2019 +0800

添加查体模板

commit 7658d6f547d6b067d42d4cbaebc07e46d206340f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:10:15 2019 +0800

独立标签标签归属名称

commit 7b0204b6b2fb9ab2c1adbdc29b7af8cfb68da26f
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 18:56:57 2019 +0800

提示信息详情完成

commit 5e8f323a81a735e062abbd0289fef01ed39646b3
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 15:58:36 2019 +0800

提示信息详情删除修改-接口对接

commit 74714bd95e9ba5a0312b1afc44ca8b156d8e9f6c
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 17:44:53 2019 +0800

test

commit 2bf8231b03c8eef66abfc2e1a6f9d96c457c2e67
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 8 15:21:28 2019 +0800

提示信息添加

commit ddc468fe5f2c18dd3860ffdad97cdb3e9c8d30d8
Merge: 5033494 b809a69
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:31:28 2019 +0800

Merge branch 'dev2/luolei' into dev

commit b809a6993c8f2b4d53a921ed17ce4beb96afe714
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:30:52 2019 +0800

药品分类

commit 5033494965fd13f7511755590f106a42a08ba368
Merge: 069d57c 11280b2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:25:59 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit c17df7317718acbf2dfbde32fcc545f1ed818af8
Merge: 069d57c 11280b2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:22:38 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 11280b23fd6f56315cf8b686f9ed9279c4d92bff
Merge: 0ac18a8 c96333d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:18:52 2019 +0800

merge from 'luolei'

commit 069d57c50a1aec671dc3e6a9a531cbf07472adad
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:10:14 2019 +0800

注释

commit a380af30e459f7db199c78963f1d138747880822
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:08:58 2019 +0800

11

commit 0ac18a8c7555daba27c2693ea6dc6fd08ed94e55
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:07:50 2019 +0800

修改参数转换函数

commit 370bfc071e6e89235fee91aa495bb89b662d3713
Merge: c96333d a8359c2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:04:12 2019 +0800

Merge branch 'dev' into dev2/luolei

commit 6074687f3d18f71e668224ca59e514b6696a558f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:04:12 2019 +0800

修改独立标签样式

commit c96333d02f1af5286ef46aab04ef104963d4bbaa
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:02:56 2019 +0800

样式

commit cc411cc6733931097a8cdd6b9c57b192d8935196
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:02:29 2019 +0800

Revert "修改独立标签样式"

This reverts commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9.

commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:01:23 2019 +0800

修改独立标签样式

commit 5ac3b253c2d3fca4de474100b650bab1b0138d61
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:55:17 2019 +0800

11

commit a8359c2a226ae695bfa22c2e480088e025fe192b
Merge: 072bc67 cb3e95b
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:32:32 2019 +0800

Merge branch 'dev2/luolei' into dev

commit cb3e95b38a46ba9e38a311f72f933c534cee104e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:31:04 2019 +0800

123456

commit bb5b301daacc785155578147f66575848d39c21f
Merge: 1b9fe73 072bc67
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:23:55 2019 +0800

merge from 'dev'

commit 1b9fe73bd1fae8e2eef414e520b985cee7c17e93
Merge: 45f3fff a28b97b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:18:52 2019 +0800

merge feom 'luolei'

commit 45f3fff542bbdb72399411b0d807c45ef53cfe9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:14:22 2019 +0800

查体模板维护

commit e91e545be4b9fa9eb9d3738c636b2d3be4934c50
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 09:56:18 2019 +0800

修改参数转换tagFlag

commit 072bc671096d52b8a4f477f562fd26340bfde0ca
Merge: 376205e a28b97b
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 17:44:22 2019 +0800

Merge branch 'dev2/luolei' into dev

commit a28b97bdbc88658bd958a9341add8f86c0c52961
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 17:39:30 2019 +0800

模板添加界面

commit cb1b285b6b482be1006e239caec531cb0bdef070
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:31:56 2019 +0800

常见科室症状添加症状

commit 2a1b26b33ac8f879bf2bd76f0b862d450651d8ba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:29:35 2019 +0800

表格添加不可拖拽属性

commit 8281112592b596ba405b5db8e49571c41e8e8d0e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:29:18 2019 +0800

常用科室症状上下排序

commit 4323a2cbd123f252dcf81a90fbfc304be5529d40
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 14:54:14 2019 +0800

独立标签最小年龄类型限制

commit 87a95a9d52190e088a05f0cac5c95c721c419fba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:55:58 2019 +0800

修改报错

commit ac0d7ede74d93bf0630e4b72eb029b78f3360907
Merge: 6e62e30 fda8c97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:54:16 2019 +0800

merge from 'dev2/luolei'

commit 6e62e30f3ae5cd9e72651f311584c203c2a468df
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:43:35 2019 +0800

归属添加药品分类

commit fda8c97ddd693aa794d87937bba640746a9439c0
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 13:43:02 2019 +0800

标签池获取问题

commit 4d0718701f413e87eec87f120249ba51127b2c1a
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 13:25:19 2019 +0800

标签组类别填写单类型9没有标签池报错问题

commit 376205ee088e63aa291e02221dcc9ebbd8b3499c
Merge: 99048a5 2f00eb8
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 7 11:41:53 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit 99048a54361560591510c2e3f79342134d9a1c29
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 7 11:41:12 2019 +0800

文件服务器地址修改

commit 6930a001d2a87a04a67f2e6b35f1362b5920ff98
Merge: c6a276a 2f00eb8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:36:35 2019 +0800

merge from 'dev'

commit fcb91f06b700e7c3d84058985ad4bd89539cf092
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 11:31:38 2019 +0800

新增模板维护系统

commit c6a276a09579b4478c1fb5c7e6aaabb7fcdef4ea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:23:13 2019 +0800

修改标签组添加是否显示加号和是否复制子标签字段

commit 3869532cff2a3c176935a9498def94f5384820ee
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:13:28 2019 +0800

添加常用科室症状

commit 2f00eb8a4baee7dae8bdf11986f139f692c3376d
Merge: 0c12c5e 0fe383a
Author: liucf <liucf@zjlantone.com>
Date: Thu Mar 7 09:58:35 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit ae8596b1e19d3b46939535694342d2b63e7bd270
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 09:16:44 2019 +0800

修改独立标签添加/修改标题

commit 0c12c5e77187de09015015fc95bc5072cb967097
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 6 16:49:04 2019 +0800

合并depart分支
Squashed commit of the following:

commit 49f3af28dbb3e149975a326ba706b0fc1e9544c4
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 6 16:42:01 2019 +0800

合并dev
Squashed commit of the following:

commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
Merge: 6dde00e f2ad245
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:15:37 2019 +0800

Merge branch 'dev2/luolei' into dev

commit f2ad24529f7716a96e6e01c57056343fcd516473
Merge: e0223af 76dfc4f
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:13:37 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 11:12:15 2019 +0800

修改标签组参数转换

commit 365b676fb3adfb19828a6295b94527da158b0a56
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 10:52:38 2019 +0800

修改独立标签没有修改不能保存问题

commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 16:46:45 2019 +0800

token失效问题

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/icss.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/LabelGroup.vue
# src/components/icss/PubTagGroup.vue

commit 19f3f1de0e04cf8c4e4980713c886087b72f22b9
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 5 16:52:40 2019 +0800

合并dev分支,并统一分页样式和删除颜色
Squashed commit of the following:

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/icss.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/InspactTagGroup.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubTagGroup.vue
# src/components/icss/SymptomPush.vue
# src/components/icss/SymptomTagGroup.vue

commit e6f42e9e126128ec189ebc2505abd3a432bd01d6
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 5 16:10:22 2019 +0800

免责声明、详情、添加修改、启用停用

commit f142c2dc630547b619612ed97270a9ff4a3221e0
Author: liucf <liucf@zjlantone.com>
Date: Mon Mar 4 21:02:41 2019 +0800

添加免责声明
Squashed commit of the following:

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/config.js
# src/api/icss.js
# src/api/utils.js
# src/components/icss/BloodPressTagGroup.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubTagGroup.vue
# src/components/icss/PubTagPartDetail.vue
# src/components/icss/SymptomTagGroup.vue
# src/routes.js

# Conflicts:
# src/components/icss/IndeptLabel.vue
# src/components/icss/LabelGroup.vue

commit 4340f9c1e06625f368d3acf2c81f10797a50d74c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 14:18:37 2019 +0800

常见科室症状

commit 0fe383a169541a4af26341a94dbdcca18026b9a9
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 13:33:31 2019 +0800

标题修改

commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
Merge: 6dde00e f2ad245
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:15:37 2019 +0800

Merge branch 'dev2/luolei' into dev

commit f2ad24529f7716a96e6e01c57056343fcd516473
Merge: e0223af 76dfc4f
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:13:37 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 11:12:15 2019 +0800

修改标签组参数转换

commit 365b676fb3adfb19828a6295b94527da158b0a56
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 10:52:38 2019 +0800

修改独立标签没有修改不能保存问题

commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 16:46:45 2019 +0800

token失效问题

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 9d5e136b249f446288db7f42347d829ff995c901
Merge: 5aa2bdc 83920a9
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:57:05 2019 +0800

Merge remote-tracking branch 'origin/dev2/luolei' into dev

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/config.js

commit 5601cff44dec52b43a0c7426e51816e6ad00523e
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 19 14:07:10 2019 +0800

合并dev
Squashed commit of the following:

commit 9d8e78e5c7915fca2d57588e2fc7de5c3f5b737c
Merge: 581d3ec 7c4e0c7
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 15:43:00 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

# Conflicts:
# src/components/icss/IndeptLabel.vue
# src/components/icss/SingleSelect.vue

commit 7c4e0c7c2759ce35aba20392f2ddf8a0a5959ca2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 15:35:49 2019 +0800

常见科室症状

commit ea0f58d9620813f41d86db07b3b423593889e890
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 15:35:21 2019 +0800

多选取消默认选中

commit 581d3eca1b25e0a4ce75d638291ba0c5a94b6e35
Merge: ddc468f cdc557d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 15:30:08 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

# Conflicts:
# src/api/config.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/PromptInfo.vue
# src/routes.js

commit cdc557d0eee2af3a58aa67bfece53cbf32c343bd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 14:54:48 2019 +0800

独立标签表格标签类型显示修改,既往史添加标签池可选类型修改

commit 44fab27447641937bfa3f934e259ddc9f9b760cf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 14:20:04 2019 +0800

症状尾巴标签池有时间单位

commit d5a9d0b0cdf2976a1d50ff484ecb5c7f6843ef66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 13:55:39 2019 +0800

下拉组件清空与下拉箭头重合修改

commit feb792b515c554af8dde2a06127d3758b2b583eb
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 13:22:48 2019 +0800

独立标签筛选类型辅捡等不显示

commit c3a666aa1af0b9c561eaa5ed589effe614e985a5
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 11:43:37 2019 +0800

后台数据typeCn转换为筛选中对应的字段名称

commit efb80b4bf9e9d8aa6298b72f8b864a671edea2b7
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 11:21:29 2019 +0800

单选无同伴同无,多选无默认选中

commit b138d164f421524e7c66ee8673102d4738078b6e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 10:06:55 2019 +0800

术语静态知识未完

commit f0659f14489821e423f9c70564969af5edf2da2b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 09:16:02 2019 +0800

其他史多选的不需要显示默认选中

commit 592302ac839e01e17286f332cee2cafda9d82d78
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:50:27 2019 +0800

修改v-show为v-if

commit cb868f04f62ef05bbf2fd5038a71845a79ba75e0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:50:05 2019 +0800

血压修改问题

commit a2aa1c103fb35c7f788fe3499b22695898a1a99a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:49:37 2019 +0800

症状修改文字标签添加标识

commit ecdfcb194300b3b88f194a5a00c19aa474c7da34
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Mar 12 10:48:55 2019 +0800

医学术语静态知识维护页面添加

commit 5fb0d31284c1ea9f980ed42ee4ec0ea6e137e851
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Mar 12 10:23:29 2019 +0800

提示信息修改

commit 27e21af25e41e49ad609a06fb46157f2b635922c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 20:32:19 2019 +0800

静态知识修改

commit c4701778218a01ab699ed29be3402cc68b9ef5da
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:27:44 2019 +0800

单选异常选项修改

commit 822df8507b0c48b06e8d9b9350001cfd1f85765e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:11:18 2019 +0800

添加查体模板

commit 7658d6f547d6b067d42d4cbaebc07e46d206340f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:10:15 2019 +0800

独立标签标签归属名称

commit 7b0204b6b2fb9ab2c1adbdc29b7af8cfb68da26f
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 18:56:57 2019 +0800

提示信息详情完成

commit 5e8f323a81a735e062abbd0289fef01ed39646b3
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 15:58:36 2019 +0800

提示信息详情删除修改-接口对接

commit 2bf8231b03c8eef66abfc2e1a6f9d96c457c2e67
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 8 15:21:28 2019 +0800

提示信息添加

commit ddc468fe5f2c18dd3860ffdad97cdb3e9c8d30d8
Merge: 5033494 b809a69
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:31:28 2019 +0800

Merge branch 'dev2/luolei' into dev

commit b809a6993c8f2b4d53a921ed17ce4beb96afe714
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:30:52 2019 +0800

药品分类

commit 5033494965fd13f7511755590f106a42a08ba368
Merge: 069d57c 11280b2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:25:59 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit c17df7317718acbf2dfbde32fcc545f1ed818af8
Merge: 069d57c 11280b2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:22:38 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 11280b23fd6f56315cf8b686f9ed9279c4d92bff
Merge: 0ac18a8 c96333d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:18:52 2019 +0800

merge from 'luolei'

commit 069d57c50a1aec671dc3e6a9a531cbf07472adad
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:10:14 2019 +0800

注释

commit a380af30e459f7db199c78963f1d138747880822
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:08:58 2019 +0800

11

commit 0ac18a8c7555daba27c2693ea6dc6fd08ed94e55
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:07:50 2019 +0800

修改参数转换函数

commit 370bfc071e6e89235fee91aa495bb89b662d3713
Merge: c96333d a8359c2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:04:12 2019 +0800

Merge branch 'dev' into dev2/luolei

commit 6074687f3d18f71e668224ca59e514b6696a558f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:04:12 2019 +0800

修改独立标签样式

commit c96333d02f1af5286ef46aab04ef104963d4bbaa
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:02:56 2019 +0800

样式

commit cc411cc6733931097a8cdd6b9c57b192d8935196
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:02:29 2019 +0800

Revert "修改独立标签样式"

This reverts commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9.

commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:01:23 2019 +0800

修改独立标签样式

commit 5ac3b253c2d3fca4de474100b650bab1b0138d61
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:55:17 2019 +0800

11

commit a8359c2a226ae695bfa22c2e480088e025fe192b
Merge: 072bc67 cb3e95b
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:32:32 2019 +0800

Merge branch 'dev2/luolei' into dev

commit cb3e95b38a46ba9e38a311f72f933c534cee104e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:31:04 2019 +0800

123456

commit bb5b301daacc785155578147f66575848d39c21f
Merge: 1b9fe73 072bc67
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:23:55 2019 +0800

merge from 'dev'

commit 1b9fe73bd1fae8e2eef414e520b985cee7c17e93
Merge: 45f3fff a28b97b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:18:52 2019 +0800

merge feom 'luolei'

commit 45f3fff542bbdb72399411b0d807c45ef53cfe9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:14:22 2019 +0800

查体模板维护

commit e91e545be4b9fa9eb9d3738c636b2d3be4934c50
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 09:56:18 2019 +0800

修改参数转换tagFlag

commit 072bc671096d52b8a4f477f562fd26340bfde0ca
Merge: 376205e a28b97b
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 17:44:22 2019 +0800

Merge branch 'dev2/luolei' into dev

commit a28b97bdbc88658bd958a9341add8f86c0c52961
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 17:39:30 2019 +0800

模板添加界面

commit cb1b285b6b482be1006e239caec531cb0bdef070
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:31:56 2019 +0800

常见科室症状添加症状

commit 2a1b26b33ac8f879bf2bd76f0b862d450651d8ba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:29:35 2019 +0800

表格添加不可拖拽属性

commit 8281112592b596ba405b5db8e49571c41e8e8d0e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:29:18 2019 +0800

常用科室症状上下排序

commit 4323a2cbd123f252dcf81a90fbfc304be5529d40
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 14:54:14 2019 +0800

独立标签最小年龄类型限制

commit 87a95a9d52190e088a05f0cac5c95c721c419fba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:55:58 2019 +0800

修改报错

commit ac0d7ede74d93bf0630e4b72eb029b78f3360907
Merge: 6e62e30 fda8c97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:54:16 2019 +0800

merge from 'dev2/luolei'

commit 6e62e30f3ae5cd9e72651f311584c203c2a468df
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:43:35 2019 +0800

归属添加药品分类

commit fda8c97ddd693aa794d87937bba640746a9439c0
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 13:43:02 2019 +0800

标签池获取问题

commit 4d0718701f413e87eec87f120249ba51127b2c1a
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 13:25:19 2019 +0800

标签组类别填写单类型9没有标签池报错问题

commit 376205ee088e63aa291e02221dcc9ebbd8b3499c
Merge: 99048a5 2f00eb8
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 7 11:41:53 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit 99048a54361560591510c2e3f79342134d9a1c29
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 7 11:41:12 2019 +0800

文件服务器地址修改

commit 6930a001d2a87a04a67f2e6b35f1362b5920ff98
Merge: c6a276a 2f00eb8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:36:35 2019 +0800

merge from 'dev'

commit fcb91f06b700e7c3d84058985ad4bd89539cf092
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 11:31:38 2019 +0800

新增模板维护系统

commit c6a276a09579b4478c1fb5c7e6aaabb7fcdef4ea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:23:13 2019 +0800

修改标签组添加是否显示加号和是否复制子标签字段

commit 3869532cff2a3c176935a9498def94f5384820ee
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:13:28 2019 +0800

添加常用科室症状

commit 2f00eb8a4baee7dae8bdf11986f139f692c3376d
Merge: 0c12c5e 0fe383a
Author: liucf <liucf@zjlantone.com>
Date: Thu Mar 7 09:58:35 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit ae8596b1e19d3b46939535694342d2b63e7bd270
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 09:16:44 2019 +0800

修改独立标签添加/修改标题

commit 0c12c5e77187de09015015fc95bc5072cb967097
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 6 16:49:04 2019 +0800

合并depart分支
Squashed commit of the following:

commit 49f3af28dbb3e149975a326ba706b0fc1e9544c4
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 6 16:42:01 2019 +0800

合并dev
Squashed commit of the following:

commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
Merge: 6dde00e f2ad245
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:15:37 2019 +0800

Merge branch 'dev2/luolei' into dev

commit f2ad24529f7716a96e6e01c57056343fcd516473
Merge: e0223af 76dfc4f
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:13:37 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 11:12:15 2019 +0800

修改标签组参数转换

commit 365b676fb3adfb19828a6295b94527da158b0a56
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 10:52:38 2019 +0800

修改独立标签没有修改不能保存问题

commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 16:46:45 2019 +0800

token失效问题

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/icss.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/LabelGroup.vue
# src/components/icss/PubTagGroup.vue

commit 19f3f1de0e04cf8c4e4980713c886087b72f22b9
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 5 16:52:40 2019 +0800

合并dev分支,并统一分页样式和删除颜色
Squashed commit of the following:

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/icss.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/InspactTagGroup.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubTagGroup.vue
# src/components/icss/SymptomPush.vue
# src/components/icss/SymptomTagGroup.vue

commit e6f42e9e126128ec189ebc2505abd3a432bd01d6
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 5 16:10:22 2019 +0800

免责声明、详情、添加修改、启用停用

commit f142c2dc630547b619612ed97270a9ff4a3221e0
Author: liucf <liucf@zjlantone.com>
Date: Mon Mar 4 21:02:41 2019 +0800

添加免责声明
Squashed commit of the following:

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/config.js
# src/api/icss.js
# src/api/utils.js
# src/components/icss/BloodPressTagGroup.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubTagGroup.vue
# src/components/icss/PubTagPartDetail.vue
# src/components/icss/SymptomTagGroup.vue
# src/routes.js

# Conflicts:
# src/components/icss/IndeptLabel.vue
# src/components/icss/LabelGroup.vue

commit 4340f9c1e06625f368d3acf2c81f10797a50d74c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 14:18:37 2019 +0800

常见科室症状

commit 0fe383a169541a4af26341a94dbdcca18026b9a9
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 13:33:31 2019 +0800

标题修改

commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
Merge: 6dde00e f2ad245
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:15:37 2019 +0800

Merge branch 'dev2/luolei' into dev

commit f2ad24529f7716a96e6e01c57056343fcd516473
Merge: e0223af 76dfc4f
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:13:37 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 11:12:15 2019 +0800

修改标签组参数转换

commit 365b676fb3adfb19828a6295b94527da158b0a56
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 10:52:38 2019 +0800

修改独立标签没有修改不能保存问题

commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 16:46:45 2019 +0800

token失效问题

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 9d5e136b249f446288db7f42347d829ff995c901
Merge: 5aa2bdc 83920a9
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:57:05 2019 +0800

Merge remote-tracking branch 'origin/dev2/luolei' into dev

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/config.js
# src/api/icss.js
# src/components/icss/AddDisclInfo.vue
# src/less/admin.less
# src/routes.js

commit 7502372e1c25af3f53fcd073d06b29dd219b9796
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 19 13:54:54 2019 +0800

医学术语命名维护-列表和查询接口调试

# Conflicts:
# src/components/icss/AddIndeptLabel.vue
# src/components/icss/CommonTemplate.vue
# src/components/icss/MedicalName.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubIndeptTag.vue
# src/components/icss/PubTagPartDetail.vue
# src/components/icss/SingleSelect.vue

commit ce9cce33ef82eb96db5547b315f716babafa9bcc
Author: Luolei <16657115156@163.com>
Date: Wed Mar 20 10:17:06 2019 +0800

去掉hash

commit 2f65f99a916f2af075a3b3764ea18a5e2a829d47
Author: Luolei <16657115156@163.com>
Date: Wed Mar 20 10:12:21 2019 +0800

样式hash值去掉

commit 54847d0f1b1cd2a5a06ebb714b30eb7b3e96f17d
Author: Luolei <16657115156@163.com>
Date: Wed Mar 20 10:08:53 2019 +0800

样式

commit db8cba2bcc19155c7b4d965485c3b2251b323e51
Merge: 3194b7b 7bd1a5d
Author: Luolei <16657115156@163.com>
Date: Wed Mar 20 09:48:13 2019 +0800

Merge branch 'dev' into test

commit 7bd1a5d18d61503c76e39c59bdd6b4e3b254b63a
Merge: d0faa02 bd615cb
Author: Luolei <16657115156@163.com>
Date: Wed Mar 20 09:43:44 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit d0faa021cb86d5344a841613bbdc56ede6f3b8ba
Merge: a4deccc c09d746
Author: Luolei <16657115156@163.com>
Date: Wed Mar 20 09:39:27 2019 +0800

Merge branch 'dev2/luolei' into dev

commit c09d7462e6ea6aa3bbf307f11e1f365ad13780fa
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 20:38:46 2019 +0800

不同归属下的标签系统名称也不能相同

commit 73d717b0f6cd1fee146796a3f89dac0ca2a56411
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 20:33:34 2019 +0800

bug修改

commit bd615cb6e92d89ae5c7b820a9cf5f0dc7f8cef8c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 19 20:28:13 2019 +0800

医学术语属性维护(未完成)

commit 494f055d10ec73bfe93e6ed8262ab4be9eb88ed5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 19 20:27:41 2019 +0800

年龄和血压标签组增加判断条件

commit 397f31fbe32c3386117fdce882b9bc7e29c000bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 19 20:15:34 2019 +0800

改变填写单类型清空标签明细

commit 3519faa11248a63ac1d8135c4cc0fb7aa5fea45f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 19 18:58:49 2019 +0800

注释掉是否能当检索项

commit a4decccbcf96daef4c71ddacea67669428270db8
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 19 17:16:04 2019 +0800

Squashed commit of the following:

commit 614834f38462e0c26b3ae7533d7072ad9ea7bcbd
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 19 15:23:15 2019 +0800

Squashed commit of the following:

commit a39882fb598ad90451fbfd224b6891a7435bf52b
Merge: eb9514a 9598d94
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 09:41:27 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 9598d94c53b73cb3df116180f76c2c1748d922e6
Merge: 621f140 a34c487
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 09:38:59 2019 +0800

Merge branch 'independentTag' into dev2/luolei

commit 621f1403ff1d937760d1dbac7a51285c21d2413a
Merge: 8c21876 019bf02
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 09:27:59 2019 +0800

Merge branch 'depart' into dev2/luolei

commit eb9514adcd6ca8b5c994e62fdc599edecc35d28b
Merge: 339757e b09082a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:41:04 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit 339757e6ffe47a70ea5b70ef9a6cbc9c6ac588f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:40:24 2019 +0800

修改填写单类型初始化非公共数据

commit c2bccce8a4757c593c46d168dbb56464f6f59825
Merge: 5f05a09 8c21876
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:34:05 2019 +0800

merge from 'dev'

commit 5f05a0901e939d421dd3dfe3bf33237b6a61ef10
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:28:34 2019 +0800

修改填写单类型,初始化非公用数据

commit b09082a5947c02980bccd544de54dc035958c3a5
Merge: 0c683ce 8c21876
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 17:27:25 2019 +0800

Merge branch 'dev' into test

commit 8c21876bee94cef3d8485d7c58a01e58d992ef80
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 17:23:46 2019 +0800

既往史toleft加判断

commit 2e06ad10f877fc0fd18ed1a40866096c01cf1314
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 16:52:41 2019 +0800

增加是否为症状

commit e056b1acc3a1161dbcc7f2b2f84a0fec4d702673
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 16:52:21 2019 +0800

增加是否为症状

commit 5b24bee80e9e7c105514218ae06b8210c9068fcf
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 16:51:42 2019 +0800

填写单类型判断bug

commit fa4b3e51bcbed84646fa2aeaf1b26a165c444e18
Merge: 95b977d 238b7a0
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 16:32:14 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 95b977da112d0c456abb8604dc287f6a92236809
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 16:32:00 2019 +0800

既往史修改

commit a34c4875dd8de5a58fbcf1d682d5b682e815b21f
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 18 15:39:52 2019 +0800

术语静态知识未完

commit 22bf16a5ab5b0dfbda03ffc078ffb9c1f865a28d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 15:12:56 2019 +0800

添加独立标签标签明细限制30个字

commit 71b2b268d6dffa536ce4a2bbb908410935854bbb
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 18 09:55:42 2019 +0800

独立标签列表显示类型bug修改

commit 0c683ce6d2a9124e8407c03bf849e012ef0bd641
Merge: 3af8ef7 238b7a0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:05:34 2019 +0800

Merge remote-tracking branch 'origin/dev' into test

commit 238b7a09cfd44561122001f946d9f7c43cbea945
Merge: 6b41a18 30f21b9
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:04:16 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit 6b41a18eedcdba1bc7a3444b19d64b310fa1a52b
Merge: 2b6eb62 2ca1fb2
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:04:11 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

commit 2b6eb62b7d560ad106f2e62e9b831f4ee01f6f9b
Merge: c93337c 1040e80
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:04:06 2019 +0800

Merge remote-tracking branch 'origin/depart' into dev

commit 30f21b92e4216e86e10df1c210f94949fe34a028
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 15 16:48:35 2019 +0800

独立标签单选多选去除空数据

commit 2ca1fb28c4f90f4ce45918ebdfcbc945fbc2ef06
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 16:46:26 2019 +0800

单选多选空选项过滤

commit 32f57b4df37b134f5ce926283617129da6f57822
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 16:19:57 2019 +0800

无控制台时默认页面不请求数据bug修改

commit a6b4df99023aa6ed9ca479a2e5dcfdff2f2dd390
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 14:59:21 2019 +0800

无控制台时默认页面不请求数据

commit c93337c2660faae3bcb7a341a28483b9e9880c2a
Merge: f3bf75a 1f970e0
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:42:25 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 3af8ef787a0fef6747c9a2dbbc1a0a06a230326a
Merge: 596e1f0 1f970e0
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:39:51 2019 +0800

Merge branch 'dev2/luolei' into test

commit 0ce01a9ceb8de1ac832df54615e7ede068e50657
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 15 13:38:52 2019 +0800

独立标签和标签组修改参数修改

commit 1f970e06ce073c126bc0a16cde614aac3dc08063
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:36:00 2019 +0800

配置文件改动

commit e0611ffef509322090d66dff6f48e78b9ad2e3c9
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:10:00 2019 +0800

bug

commit cbdb0771d38a2f2fc9f7cde87aa3ee6fc736bf47
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 11:19:44 2019 +0800

同无同伴可有多个选项,未选中行禁用按钮

commit 596e1f06cd5cfa1f53704611de405dcac15cd608
Merge: 080d5ee f3bf75a
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:41:51 2019 +0800

Merge remote-tracking branch 'origin/dev' into test

commit f3bf75aca37ff49a32bd70492ad7925be1fc07ec
Merge: 8983bf8 b5d0868
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:39:33 2019 +0800

Merge remote-tracking branch 'origin/depart' into dev

commit 8983bf86f32b0b938f78869bf8cdfadd1877fb0f
Merge: 8c43a86 2639ce7
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:35:35 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

# Conflicts:
# src/api/config.js

commit 8c43a86bfa08ee8abfce581d40a4d1b003912a22
Merge: dfcada3 3981702
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:33:47 2019 +0800

Merge remote-tracking branch 'origin/dev2/luolei' into dev

# Conflicts:
# src/api/config.js

commit dfcada342de93cad1b2e79cbcb5f09afab6f3c3b
Merge: 37d1343 1309a48
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:31:40 2019 +0800

Merge remote-tracking branch 'origin/depart' into dev

# Conflicts:
# src/api/config.js
# src/api/icss.js
# src/components/icss/AddDisclInfo.vue
# src/components/icss/AddMedicinePrompt.vue
# src/components/icss/CommonTemplate.vue
# src/components/icss/IndeptLabel.vue
# src/components/icss/MedicinePrompt.vue
# src/components/icss/PubTemplateGroup.vue
# src/components/icss/TemplateMaintenance.vue
# src/components/icss/TemplateMaintenanceWrap.vue
# src/routes.js

commit 37d1343525323228f3f5f857217daf62196ea729
Merge: 326491e 381645f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:14:37 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

commit 13f7f467645c0644b69308242e22f6510d5abfe0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 14 20:31:17 2019 +0800

增加最小年龄不能小于最大年龄判断

commit 3981702a621519f1d0b3ad497b40c0609310aab8
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 16:59:56 2019 +0800

操作人参数去错了

commit e82348bbfcca495fb9b438bd9a1ed3df4e0438f8
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 16:17:44 2019 +0800

参数调整

commit e52e7358c9b2f2ff0dda98f022f30e1e0208cf77
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 13:56:08 2019 +0800

模板维护基本完成

commit 381645fa24247459dbe2c9dfa27ab102631e63aa
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 14 13:26:13 2019 +0800

保存术语静态知识接口未完

commit 326491e11f514415af550bb36ab4a6e9b961b07f
Merge: 9d8e78e 3a35d38
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 11:23:08 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 080d5ee96746c135b8448580f490c9e7945ec511
Merge: 3a35d38 9d8e78e
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 11:20:37 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 3a35d38517110be2ff2fb9c216d38d800cc3757d
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 11:18:43 2019 +0800

模板维护功能提交

commit 2639ce711923bf4ef2c9c6dd06a515b504704748
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 14 10:51:22 2019 +0800

常见症状详情和修改

commit e39088b6d35790033d7d24ec444e9c2f8c05c92c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 16:46:33 2019 +0800

修改标签池标签类型

commit 9d8e78e5c7915fca2d57588e2fc7de5c3f5b737c
Merge: 581d3ec 7c4e0c7
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 15:43:00 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

# Conflicts:
# src/components/icss/IndeptLabel.vue
# src/components/icss/SingleSelect.vue

commit 7c4e0c7c2759ce35aba20392f2ddf8a0a5959ca2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 15:35:49 2019 +0800

常见科室症状

commit ea0f58d9620813f41d86db07b3b423593889e890
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 15:35:21 2019 +0800

多选取消默认选中

commit 581d3eca1b25e0a4ce75d638291ba0c5a94b6e35
Merge: ddc468f cdc557d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 15:30:08 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

# Conflicts:
# src/api/config.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/PromptInfo.vue
# src/routes.js

commit cdc557d0eee2af3a58aa67bfece53cbf32c343bd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 14:54:48 2019 +0800

独立标签表格标签类型显示修改,既往史添加标签池可选类型修改

commit 44fab27447641937bfa3f934e259ddc9f9b760cf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 14:20:04 2019 +0800

症状尾巴标签池有时间单位

commit d5a9d0b0cdf2976a1d50ff484ecb5c7f6843ef66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 13:55:39 2019 +0800

下拉组件清空与下拉箭头重合修改

commit feb792b515c554af8dde2a06127d3758b2b583eb
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 13:22:48 2019 +0800

独立标签筛选类型辅捡等不显示

commit c3a666aa1af0b9c561eaa5ed589effe614e985a5
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 11:43:37 2019 +0800

后台数据typeCn转换为筛选中对应的字段名称

commit efb80b4bf9e9d8aa6298b72f8b864a671edea2b7
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 11:21:29 2019 +0800

单选无同伴同无,多选无默认选中

commit b138d164f421524e7c66ee8673102d4738078b6e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 10:06:55 2019 +0800

术语静态知识未完

commit f0659f14489821e423f9c70564969af5edf2da2b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 09:16:02 2019 +0800

其他史多选的不需要显示默认选中

commit 592302ac839e01e17286f332cee2cafda9d82d78
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:50:27 2019 +0800

修改v-show为v-if

commit cb868f04f62ef05bbf2fd5038a71845a79ba75e0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:50:05 2019 +0800

血压修改问题

commit a2aa1c103fb35c7f788fe3499b22695898a1a99a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:49:37 2019 +0800

症状修改文字标签添加标识

commit ecdfcb194300b3b88f194a5a00c19aa474c7da34
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Mar 12 10:48:55 2019 +0800

医学术语静态知识维护页面添加

commit 5fb0d31284c1ea9f980ed42ee4ec0ea6e137e851
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Mar 12 10:23:29 2019 +0800

提示信息修改

commit 27e21af25e41e49ad609a06fb46157f2b635922c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 20:32:19 2019 +0800

静态知识修改

commit c4701778218a01ab699ed29be3402cc68b9ef5da
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:27:44 2019 +0800

单选异常选项修改

commit 822df8507b0c48b06e8d9b9350001cfd1f85765e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:11:18 2019 +0800

添加查体模板

commit 7658d6f547d6b067d42d4cbaebc07e46d206340f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:10:15 2019 +0800

独立标签标签归属名称

commit 7b0204b6b2fb9ab2c1adbdc29b7af8cfb68da26f
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 18:56:57 2019 +0800

提示信息详情完成

commit 5e8f323a81a735e062abbd0289fef01ed39646b3
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 15:58:36 2019 +0800

提示信息详情删除修改-接口对接

commit 74714bd95e9ba5a0312b1afc44ca8b156d8e9f6c
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 17:44:53 2019 +0800

test

commit 2bf8231b03c8eef66abfc2e1a6f9d96c457c2e67
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 8 15:21:28 2019 +0800

提示信息添加

commit ddc468fe5f2c18dd3860ffdad97cdb3e9c8d30d8
Merge: 5033494 b809a69
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:31:28 2019 +0800

Merge branch 'dev2/luolei' into dev

commit b809a6993c8f2b4d53a921ed17ce4beb96afe714
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:30:52 2019 +0800

药品分类

commit 5033494965fd13f7511755590f106a42a08ba368
Merge: 069d57c 11280b2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:25:59 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit c17df7317718acbf2dfbde32fcc545f1ed818af8
Merge: 069d57c 11280b2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:22:38 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 11280b23fd6f56315cf8b686f9ed9279c4d92bff
Merge: 0ac18a8 c96333d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:18:52 2019 +0800

merge from 'luolei'

commit 069d57c50a1aec671dc3e6a9a531cbf07472adad
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:10:14 2019 +0800

注释

commit a380af30e459f7db199c78963f1d138747880822
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:08:58 2019 +0800

11

commit 0ac18a8c7555daba27c2693ea6dc6fd08ed94e55
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:07:50 2019 +0800

修改参数转换函数

commit 370bfc071e6e89235fee91aa495bb89b662d3713
Merge: c96333d a8359c2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:04:12 2019 +0800

Merge branch 'dev' into dev2/luolei

commit 6074687f3d18f71e668224ca59e514b6696a558f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:04:12 2019 +0800

修改独立标签样式

commit c96333d02f1af5286ef46aab04ef104963d4bbaa
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:02:56 2019 +0800

样式

commit cc411cc6733931097a8cdd6b9c57b192d8935196
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:02:29 2019 +0800

Revert "修改独立标签样式"

This reverts commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9.

commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:01:23 2019 +0800

修改独立标签样式

commit 5ac3b253c2d3fca4de474100b650bab1b0138d61
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:55:17 2019 +0800

11

commit a8359c2a226ae695bfa22c2e480088e025fe192b
Merge: 072bc67 cb3e95b
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:32:32 2019 +0800

Merge branch 'dev2/luolei' into dev

commit cb3e95b38a46ba9e38a311f72f933c534cee104e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:31:04 2019 +0800

123456

commit bb5b301daacc785155578147f66575848d39c21f
Merge: 1b9fe73 072bc67
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:23:55 2019 +0800

merge from 'dev'

commit 1b9fe73bd1fae8e2eef414e520b985cee7c17e93
Merge: 45f3fff a28b97b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:18:52 2019 +0800

merge feom 'luolei'

commit 45f3fff542bbdb72399411b0d807c45ef53cfe9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:14:22 2019 +0800

查体模板维护

commit e91e545be4b9fa9eb9d3738c636b2d3be4934c50
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 09:56:18 2019 +0800

修改参数转换tagFlag

commit 072bc671096d52b8a4f477f562fd26340bfde0ca
Merge: 376205e a28b97b
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 17:44:22 2019 +0800

Merge branch 'dev2/luolei' into dev

commit a28b97bdbc88658bd958a9341add8f86c0c52961
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 17:39:30 2019 +0800

模板添加界面

commit cb1b285b6b482be1006e239caec531cb0bdef070
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:31:56 2019 +0800

常见科室症状添加症状

commit 2a1b26b33ac8f879bf2bd76f0b862d450651d8ba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:29:35 2019 +0800

表格添加不可拖拽属性

commit 8281112592b596ba405b5db8e49571c41e8e8d0e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:29:18 2019 +0800

常用科室症状上下排序

commit 4323a2cbd123f252dcf81a90fbfc304be5529d40
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 14:54:14 2019 +0800

独立标签最小年龄类型限制

commit 87a95a9d52190e088a05f0cac5c95c721c419fba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:55:58 2019 +0800

修改报错

commit ac0d7ede74d93bf0630e4b72eb029b78f3360907
Merge: 6e62e30 fda8c97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:54:16 2019 +0800

merge from 'dev2/luolei'

commit 6e62e30f3ae5cd9e72651f311584c203c2a468df
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:43:35 2019 +0800

归属添加药品分类

commit fda8c97ddd693aa794d87937bba640746a9439c0
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 13:43:02 2019 +0800

标签池获取问题

commit 4d0718701f413e87eec87f120249ba51127b2c1a
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 13:25:19 2019 +0800

标签组类别填写单类型9没有标签池报错问题

commit 376205ee088e63aa291e02221dcc9ebbd8b3499c
Merge: 99048a5 2f00eb8
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 7 11:41:53 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit 99048a54361560591510c2e3f79342134d9a1c29
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 7 11:41:12 2019 +0800

文件服务器地址修改

commit 6930a001d2a87a04a67f2e6b35f1362b5920ff98
Merge: c6a276a 2f00eb8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:36:35 2019 +0800

merge from 'dev'

commit fcb91f06b700e7c3d84058985ad4bd89539cf092
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 11:31:38 2019 +0800

新增模板维护系统

commit c6a276a09579b4478c1fb5c7e6aaabb7fcdef4ea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:23:13 2019 +0800

修改标签组添加是否显示加号和是否复制子标签字段

commit 3869532cff2a3c176935a9498def94f5384820ee
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:13:28 2019 +0800

添加常用科室症状

commit 2f00eb8a4baee7dae8bdf11986f139f692c3376d
Merge: 0c12c5e 0fe383a
Author: liucf <liucf@zjlantone.com>
Date: Thu Mar 7 09:58:35 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit ae8596b1e19d3b46939535694342d2b63e7bd270
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 09:16:44 2019 +0800

修改独立标签添加/修改标题

commit 0c12c5e77187de09015015fc95bc5072cb967097
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 6 16:49:04 2019 +0800

合并depart分支
Squashed commit of the following:

commit 49f3af28dbb3e149975a326ba706b0fc1e9544c4
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 6 16:42:01 2019 +0800

合并dev
Squashed commit of the following:

commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
Merge: 6dde00e f2ad245
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:15:37 2019 +0800

Merge branch 'dev2/luolei' into dev

commit f2ad24529f7716a96e6e01c57056343fcd516473
Merge: e0223af 76dfc4f
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:13:37 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 11:12:15 2019 +0800

修改标签组参数转换

commit 365b676fb3adfb19828a6295b94527da158b0a56
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 10:52:38 2019 +0800

修改独立标签没有修改不能保存问题

commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 16:46:45 2019 +0800

token失效问题

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/icss.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/LabelGroup.vue
# src/components/icss/PubTagGroup.vue

commit 19f3f1de0e04cf8c4e4980713c886087b72f22b9
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 5 16:52:40 2019 +0800

合并dev分支,并统一分页样式和删除颜色
Squashed commit of the following:

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/icss.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/InspactTagGroup.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubTagGroup.vue
# src/components/icss/SymptomPush.vue
# src/components/icss/SymptomTagGroup.vue

commit e6f42e9e126128ec189ebc2505abd3a432bd01d6
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 5 16:10:22 2019 +0800

免责声明、详情、添加修改、启用停用

commit f142c2dc630547b619612ed97270a9ff4a3221e0
Author: liucf <liucf@zjlantone.com>
Date: Mon Mar 4 21:02:41 2019 +0800

添加免责声明
Squashed commit of the following:

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/config.js
# src/api/icss.js
# src/api/utils.js
# src/components/icss/BloodPressTagGroup.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubTagGroup.vue
# src/components/icss/PubTagPartDetail.vue
# src/components/icss/SymptomTagGroup.vue
# src/routes.js

# Conflicts:
# src/components/icss/IndeptLabel.vue
# src/components/icss/LabelGroup.vue

commit 4340f9c1e06625f368d3acf2c81f10797a50d74c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 14:18:37 2019 +0800

常见科室症状

commit 0fe383a169541a4af26341a94dbdcca18026b9a9
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 13:33:31 2019 +0800

标题修改

commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
Merge: 6dde00e f2ad245
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:15:37 2019 +0800

Merge branch 'dev2/luolei' into dev

commit f2ad24529f7716a96e6e01c57056343fcd516473
Merge: e0223af 76dfc4f
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:13:37 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 11:12:15 2019 +0800

修改标签组参数转换

commit 365b676fb3adfb19828a6295b94527da158b0a56
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 10:52:38 2019 +0800

修改独立标签没有修改不能保存问题

commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 16:46:45 2019 +0800

token失效问题

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 9d5e136b249f446288db7f42347d829ff995c901
Merge: 5aa2bdc 83920a9
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:57:05 2019 +0800

Merge remote-tracking branch 'origin/dev2/luolei' into dev

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/config.js

commit 5601cff44dec52b43a0c7426e51816e6ad00523e
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 19 14:07:10 2019 +0800

合并dev
Squashed commit of the following:

commit 9d8e78e5c7915fca2d57588e2fc7de5c3f5b737c
Merge: 581d3ec 7c4e0c7
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 15:43:00 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

# Conflicts:
# src/components/icss/IndeptLabel.vue
# src/components/icss/SingleSelect.vue

commit 7c4e0c7c2759ce35aba20392f2ddf8a0a5959ca2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 15:35:49 2019 +0800

常见科室症状

commit ea0f58d9620813f41d86db07b3b423593889e890
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 15:35:21 2019 +0800

多选取消默认选中

commit 581d3eca1b25e0a4ce75d638291ba0c5a94b6e35
Merge: ddc468f cdc557d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 15:30:08 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

# Conflicts:
# src/api/config.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/PromptInfo.vue
# src/routes.js

commit cdc557d0eee2af3a58aa67bfece53cbf32c343bd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 14:54:48 2019 +0800

独立标签表格标签类型显示修改,既往史添加标签池可选类型修改

commit 44fab27447641937bfa3f934e259ddc9f9b760cf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 14:20:04 2019 +0800

症状尾巴标签池有时间单位

commit d5a9d0b0cdf2976a1d50ff484ecb5c7f6843ef66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 13:55:39 2019 +0800

下拉组件清空与下拉箭头重合修改

commit feb792b515c554af8dde2a06127d3758b2b583eb
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 13:22:48 2019 +0800

独立标签筛选类型辅捡等不显示

commit c3a666aa1af0b9c561eaa5ed589effe614e985a5
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 11:43:37 2019 +0800

后台数据typeCn转换为筛选中对应的字段名称

commit efb80b4bf9e9d8aa6298b72f8b864a671edea2b7
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 11:21:29 2019 +0800

单选无同伴同无,多选无默认选中

commit b138d164f421524e7c66ee8673102d4738078b6e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 10:06:55 2019 +0800

术语静态知识未完

commit f0659f14489821e423f9c70564969af5edf2da2b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 09:16:02 2019 +0800

其他史多选的不需要显示默认选中

commit 592302ac839e01e17286f332cee2cafda9d82d78
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:50:27 2019 +0800

修改v-show为v-if

commit cb868f04f62ef05bbf2fd5038a71845a79ba75e0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:50:05 2019 +0800

血压修改问题

commit a2aa1c103fb35c7f788fe3499b22695898a1a99a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:49:37 2019 +0800

症状修改文字标签添加标识

commit ecdfcb194300b3b88f194a5a00c19aa474c7da34
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Mar 12 10:48:55 2019 +0800

医学术语静态知识维护页面添加

commit 5fb0d31284c1ea9f980ed42ee4ec0ea6e137e851
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Mar 12 10:23:29 2019 +0800

提示信息修改

commit 27e21af25e41e49ad609a06fb46157f2b635922c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 20:32:19 2019 +0800

静态知识修改

commit c4701778218a01ab699ed29be3402cc68b9ef5da
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:27:44 2019 +0800

单选异常选项修改

commit 822df8507b0c48b06e8d9b9350001cfd1f85765e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:11:18 2019 +0800

添加查体模板

commit 7658d6f547d6b067d42d4cbaebc07e46d206340f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:10:15 2019 +0800

独立标签标签归属名称

commit 7b0204b6b2fb9ab2c1adbdc29b7af8cfb68da26f
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 18:56:57 2019 +0800

提示信息详情完成

commit 5e8f323a81a735e062abbd0289fef01ed39646b3
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 15:58:36 2019 +0800

提示信息详情删除修改-接口对接

commit 2bf8231b03c8eef66abfc2e1a6f9d96c457c2e67
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 8 15:21:28 2019 +0800

提示信息添加

commit ddc468fe5f2c18dd3860ffdad97cdb3e9c8d30d8
Merge: 5033494 b809a69
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:31:28 2019 +0800

Merge branch 'dev2/luolei' into dev

commit b809a6993c8f2b4d53a921ed17ce4beb96afe714
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:30:52 2019 +0800

药品分类

commit 5033494965fd13f7511755590f106a42a08ba368
Merge: 069d57c 11280b2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:25:59 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit c17df7317718acbf2dfbde32fcc545f1ed818af8
Merge: 069d57c 11280b2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:22:38 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 11280b23fd6f56315cf8b686f9ed9279c4d92bff
Merge: 0ac18a8 c96333d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:18:52 2019 +0800

merge from 'luolei'

commit 069d57c50a1aec671dc3e6a9a531cbf07472adad
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:10:14 2019 +0800

注释

commit a380af30e459f7db199c78963f1d138747880822
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:08:58 2019 +0800

11

commit 0ac18a8c7555daba27c2693ea6dc6fd08ed94e55
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:07:50 2019 +0800

修改参数转换函数

commit 370bfc071e6e89235fee91aa495bb89b662d3713
Merge: c96333d a8359c2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:04:12 2019 +0800

Merge branch 'dev' into dev2/luolei

commit 6074687f3d18f71e668224ca59e514b6696a558f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:04:12 2019 +0800

修改独立标签样式

commit c96333d02f1af5286ef46aab04ef104963d4bbaa
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:02:56 2019 +0800

样式

commit cc411cc6733931097a8cdd6b9c57b192d8935196
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:02:29 2019 +0800

Revert "修改独立标签样式"

This reverts commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9.

commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:01:23 2019 +0800

修改独立标签样式

commit 5ac3b253c2d3fca4de474100b650bab1b0138d61
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:55:17 2019 +0800

11

commit a8359c2a226ae695bfa22c2e480088e025fe192b
Merge: 072bc67 cb3e95b
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:32:32 2019 +0800

Merge branch 'dev2/luolei' into dev

commit cb3e95b38a46ba9e38a311f72f933c534cee104e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:31:04 2019 +0800

123456

commit bb5b301daacc785155578147f66575848d39c21f
Merge: 1b9fe73 072bc67
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:23:55 2019 +0800

merge from 'dev'

commit 1b9fe73bd1fae8e2eef414e520b985cee7c17e93
Merge: 45f3fff a28b97b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:18:52 2019 +0800

merge feom 'luolei'

commit 45f3fff542bbdb72399411b0d807c45ef53cfe9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:14:22 2019 +0800

查体模板维护

commit e91e545be4b9fa9eb9d3738c636b2d3be4934c50
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 09:56:18 2019 +0800

修改参数转换tagFlag

commit 072bc671096d52b8a4f477f562fd26340bfde0ca
Merge: 376205e a28b97b
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 17:44:22 2019 +0800

Merge branch 'dev2/luolei' into dev

commit a28b97bdbc88658bd958a9341add8f86c0c52961
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 17:39:30 2019 +0800

模板添加界面

commit cb1b285b6b482be1006e239caec531cb0bdef070
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:31:56 2019 +0800

常见科室症状添加症状

commit 2a1b26b33ac8f879bf2bd76f0b862d450651d8ba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:29:35 2019 +0800

表格添加不可拖拽属性

commit 8281112592b596ba405b5db8e49571c41e8e8d0e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:29:18 2019 +0800

常用科室症状上下排序

commit 4323a2cbd123f252dcf81a90fbfc304be5529d40
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 14:54:14 2019 +0800

独立标签最小年龄类型限制

commit 87a95a9d52190e088a05f0cac5c95c721c419fba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:55:58 2019 +0800

修改报错

commit ac0d7ede74d93bf0630e4b72eb029b78f3360907
Merge: 6e62e30 fda8c97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:54:16 2019 +0800

merge from 'dev2/luolei'

commit 6e62e30f3ae5cd9e72651f311584c203c2a468df
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:43:35 2019 +0800

归属添加药品分类

commit fda8c97ddd693aa794d87937bba640746a9439c0
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 13:43:02 2019 +0800

标签池获取问题

commit 4d0718701f413e87eec87f120249ba51127b2c1a
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 13:25:19 2019 +0800

标签组类别填写单类型9没有标签池报错问题

commit 376205ee088e63aa291e02221dcc9ebbd8b3499c
Merge: 99048a5 2f00eb8
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 7 11:41:53 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit 99048a54361560591510c2e3f79342134d9a1c29
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 7 11:41:12 2019 +0800

文件服务器地址修改

commit 6930a001d2a87a04a67f2e6b35f1362b5920ff98
Merge: c6a276a 2f00eb8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:36:35 2019 +0800

merge from 'dev'

commit fcb91f06b700e7c3d84058985ad4bd89539cf092
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 11:31:38 2019 +0800

新增模板维护系统

commit c6a276a09579b4478c1fb5c7e6aaabb7fcdef4ea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:23:13 2019 +0800

修改标签组添加是否显示加号和是否复制子标签字段

commit 3869532cff2a3c176935a9498def94f5384820ee
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:13:28 2019 +0800

添加常用科室症状

commit 2f00eb8a4baee7dae8bdf11986f139f692c3376d
Merge: 0c12c5e 0fe383a
Author: liucf <liucf@zjlantone.com>
Date: Thu Mar 7 09:58:35 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit ae8596b1e19d3b46939535694342d2b63e7bd270
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 09:16:44 2019 +0800

修改独立标签添加/修改标题

commit 0c12c5e77187de09015015fc95bc5072cb967097
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 6 16:49:04 2019 +0800

合并depart分支
Squashed commit of the following:

commit 49f3af28dbb3e149975a326ba706b0fc1e9544c4
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 6 16:42:01 2019 +0800

合并dev
Squashed commit of the following:

commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
Merge: 6dde00e f2ad245
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:15:37 2019 +0800

Merge branch 'dev2/luolei' into dev

commit f2ad24529f7716a96e6e01c57056343fcd516473
Merge: e0223af 76dfc4f
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:13:37 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 11:12:15 2019 +0800

修改标签组参数转换

commit 365b676fb3adfb19828a6295b94527da158b0a56
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 10:52:38 2019 +0800

修改独立标签没有修改不能保存问题

commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 16:46:45 2019 +0800

token失效问题

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/icss.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/LabelGroup.vue
# src/components/icss/PubTagGroup.vue

commit 19f3f1de0e04cf8c4e4980713c886087b72f22b9
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 5 16:52:40 2019 +0800

合并dev分支,并统一分页样式和删除颜色
Squashed commit of the following:

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/icss.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/InspactTagGroup.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubTagGroup.vue
# src/components/icss/SymptomPush.vue
# src/components/icss/SymptomTagGroup.vue

commit e6f42e9e126128ec189ebc2505abd3a432bd01d6
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 5 16:10:22 2019 +0800

免责声明、详情、添加修改、启用停用

commit f142c2dc630547b619612ed97270a9ff4a3221e0
Author: liucf <liucf@zjlantone.com>
Date: Mon Mar 4 21:02:41 2019 +0800

添加免责声明
Squashed commit of the following:

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/config.js
# src/api/icss.js
# src/api/utils.js
# src/components/icss/BloodPressTagGroup.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubTagGroup.vue
# src/components/icss/PubTagPartDetail.vue
# src/components/icss/SymptomTagGroup.vue
# src/routes.js

# Conflicts:
# src/components/icss/IndeptLabel.vue
# src/components/icss/LabelGroup.vue

commit 4340f9c1e06625f368d3acf2c81f10797a50d74c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 14:18:37 2019 +0800

常见科室症状

commit 0fe383a169541a4af26341a94dbdcca18026b9a9
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 13:33:31 2019 +0800

标题修改

commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
Merge: 6dde00e f2ad245
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:15:37 2019 +0800

Merge branch 'dev2/luolei' into dev

commit f2ad24529f7716a96e6e01c57056343fcd516473
Merge: e0223af 76dfc4f
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:13:37 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 11:12:15 2019 +0800

修改标签组参数转换

commit 365b676fb3adfb19828a6295b94527da158b0a56
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 10:52:38 2019 +0800

修改独立标签没有修改不能保存问题

commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 16:46:45 2019 +0800

token失效问题

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 9d5e136b249f446288db7f42347d829ff995c901
Merge: 5aa2bdc 83920a9
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:57:05 2019 +0800

Merge remote-tracking branch 'origin/dev2/luolei' into dev

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/config.js
# src/api/icss.js
# src/components/icss/AddDisclInfo.vue
# src/less/admin.less
# src/routes.js

commit 7502372e1c25af3f53fcd073d06b29dd219b9796
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 19 13:54:54 2019 +0800

医学术语命名维护-列表和查询接口调试

# Conflicts:
# src/api/config.js
# src/api/icss.js

commit 1263c0e0c9b26b0cc7d9e7543ebdec354397b4ce
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 19 15:36:01 2019 +0800

修改添加按钮类型

commit 972e012f4067536007948300e720866843e0132e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 19 15:35:32 2019 +0800

独立标签填写单增加类型

commit a39882fb598ad90451fbfd224b6891a7435bf52b
Merge: eb9514a 9598d94
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 09:41:27 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 3194b7bc94519b7ed20253a4134728107c7e819f
Merge: eb9514a 9598d94
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 09:40:31 2019 +0800

Merge branch 'dev2/luolei' into test

commit 9598d94c53b73cb3df116180f76c2c1748d922e6
Merge: 621f140 a34c487
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 09:38:59 2019 +0800

Merge branch 'independentTag' into dev2/luolei

commit 621f1403ff1d937760d1dbac7a51285c21d2413a
Merge: 8c21876 019bf02
Author: Luolei <16657115156@163.com>
Date: Tue Mar 19 09:27:59 2019 +0800

Merge branch 'depart' into dev2/luolei

commit eb9514adcd6ca8b5c994e62fdc599edecc35d28b
Merge: 339757e b09082a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:41:04 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit 339757e6ffe47a70ea5b70ef9a6cbc9c6ac588f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:40:24 2019 +0800

修改填写单类型初始化非公共数据

commit c2bccce8a4757c593c46d168dbb56464f6f59825
Merge: 5f05a09 8c21876
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:34:05 2019 +0800

merge from 'dev'

commit 5f05a0901e939d421dd3dfe3bf33237b6a61ef10
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 17:28:34 2019 +0800

修改填写单类型,初始化非公用数据

commit b09082a5947c02980bccd544de54dc035958c3a5
Merge: 0c683ce 8c21876
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 17:27:25 2019 +0800

Merge branch 'dev' into test

commit 8c21876bee94cef3d8485d7c58a01e58d992ef80
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 17:23:46 2019 +0800

既往史toleft加判断

commit 2e06ad10f877fc0fd18ed1a40866096c01cf1314
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 16:52:41 2019 +0800

增加是否为症状

commit e056b1acc3a1161dbcc7f2b2f84a0fec4d702673
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 16:52:21 2019 +0800

增加是否为症状

commit 5b24bee80e9e7c105514218ae06b8210c9068fcf
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 16:51:42 2019 +0800

填写单类型判断bug

commit fa4b3e51bcbed84646fa2aeaf1b26a165c444e18
Merge: 95b977d 238b7a0
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 16:32:14 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 95b977da112d0c456abb8604dc287f6a92236809
Author: Luolei <16657115156@163.com>
Date: Mon Mar 18 16:32:00 2019 +0800

既往史修改

commit a34c4875dd8de5a58fbcf1d682d5b682e815b21f
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 18 15:39:52 2019 +0800

术语静态知识未完

commit 22bf16a5ab5b0dfbda03ffc078ffb9c1f865a28d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 18 15:12:56 2019 +0800

添加独立标签标签明细限制30个字

commit 71b2b268d6dffa536ce4a2bbb908410935854bbb
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 18 09:55:42 2019 +0800

独立标签列表显示类型bug修改

commit 0c683ce6d2a9124e8407c03bf849e012ef0bd641
Merge: 3af8ef7 238b7a0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:05:34 2019 +0800

Merge remote-tracking branch 'origin/dev' into test

commit 238b7a09cfd44561122001f946d9f7c43cbea945
Merge: 6b41a18 30f21b9
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:04:16 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit 6b41a18eedcdba1bc7a3444b19d64b310fa1a52b
Merge: 2b6eb62 2ca1fb2
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:04:11 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

commit 2b6eb62b7d560ad106f2e62e9b831f4ee01f6f9b
Merge: c93337c 1040e80
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 17:04:06 2019 +0800

Merge remote-tracking branch 'origin/depart' into dev

commit 30f21b92e4216e86e10df1c210f94949fe34a028
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 15 16:48:35 2019 +0800

独立标签单选多选去除空数据

commit 2ca1fb28c4f90f4ce45918ebdfcbc945fbc2ef06
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 16:46:26 2019 +0800

单选多选空选项过滤

commit 32f57b4df37b134f5ce926283617129da6f57822
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 16:19:57 2019 +0800

无控制台时默认页面不请求数据bug修改

commit a6b4df99023aa6ed9ca479a2e5dcfdff2f2dd390
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 14:59:21 2019 +0800

无控制台时默认页面不请求数据

commit c93337c2660faae3bcb7a341a28483b9e9880c2a
Merge: f3bf75a 1f970e0
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:42:25 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 3af8ef787a0fef6747c9a2dbbc1a0a06a230326a
Merge: 596e1f0 1f970e0
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:39:51 2019 +0800

Merge branch 'dev2/luolei' into test

commit 0ce01a9ceb8de1ac832df54615e7ede068e50657
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 15 13:38:52 2019 +0800

独立标签和标签组修改参数修改

commit 1f970e06ce073c126bc0a16cde614aac3dc08063
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:36:00 2019 +0800

配置文件改动

commit e0611ffef509322090d66dff6f48e78b9ad2e3c9
Author: Luolei <16657115156@163.com>
Date: Fri Mar 15 13:10:00 2019 +0800

bug

commit cbdb0771d38a2f2fc9f7cde87aa3ee6fc736bf47
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 11:19:44 2019 +0800

同无同伴可有多个选项,未选中行禁用按钮

commit 596e1f06cd5cfa1f53704611de405dcac15cd608
Merge: 080d5ee f3bf75a
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:41:51 2019 +0800

Merge remote-tracking branch 'origin/dev' into test

commit f3bf75aca37ff49a32bd70492ad7925be1fc07ec
Merge: 8983bf8 b5d0868
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:39:33 2019 +0800

Merge remote-tracking branch 'origin/depart' into dev

commit 8983bf86f32b0b938f78869bf8cdfadd1877fb0f
Merge: 8c43a86 2639ce7
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:35:35 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

# Conflicts:
# src/api/config.js

commit 8c43a86bfa08ee8abfce581d40a4d1b003912a22
Merge: dfcada3 3981702
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:33:47 2019 +0800

Merge remote-tracking branch 'origin/dev2/luolei' into dev

# Conflicts:
# src/api/config.js

commit dfcada342de93cad1b2e79cbcb5f09afab6f3c3b
Merge: 37d1343 1309a48
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:31:40 2019 +0800

Merge remote-tracking branch 'origin/depart' into dev

# Conflicts:
# src/api/config.js
# src/api/icss.js
# src/components/icss/AddDisclInfo.vue
# src/components/icss/AddMedicinePrompt.vue
# src/components/icss/CommonTemplate.vue
# src/components/icss/IndeptLabel.vue
# src/components/icss/MedicinePrompt.vue
# src/components/icss/PubTemplateGroup.vue
# src/components/icss/TemplateMaintenance.vue
# src/components/icss/TemplateMaintenanceWrap.vue
# src/routes.js

commit 37d1343525323228f3f5f857217daf62196ea729
Merge: 326491e 381645f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 15 10:14:37 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

commit 13f7f467645c0644b69308242e22f6510d5abfe0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 14 20:31:17 2019 +0800

增加最小年龄不能小于最大年龄判断

commit 3981702a621519f1d0b3ad497b40c0609310aab8
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 16:59:56 2019 +0800

操作人参数去错了

commit e82348bbfcca495fb9b438bd9a1ed3df4e0438f8
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 16:17:44 2019 +0800

参数调整

commit e52e7358c9b2f2ff0dda98f022f30e1e0208cf77
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 13:56:08 2019 +0800

模板维护基本完成

commit 381645fa24247459dbe2c9dfa27ab102631e63aa
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 14 13:26:13 2019 +0800

保存术语静态知识接口未完

commit 326491e11f514415af550bb36ab4a6e9b961b07f
Merge: 9d8e78e 3a35d38
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 11:23:08 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 080d5ee96746c135b8448580f490c9e7945ec511
Merge: 3a35d38 9d8e78e
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 11:20:37 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 3a35d38517110be2ff2fb9c216d38d800cc3757d
Author: Luolei <16657115156@163.com>
Date: Thu Mar 14 11:18:43 2019 +0800

模板维护功能提交

commit 2639ce711923bf4ef2c9c6dd06a515b504704748
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 14 10:51:22 2019 +0800

常见症状详情和修改

commit e39088b6d35790033d7d24ec444e9c2f8c05c92c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 16:46:33 2019 +0800

修改标签池标签类型

commit 9d8e78e5c7915fca2d57588e2fc7de5c3f5b737c
Merge: 581d3ec 7c4e0c7
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 15:43:00 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

# Conflicts:
# src/components/icss/IndeptLabel.vue
# src/components/icss/SingleSelect.vue

commit 7c4e0c7c2759ce35aba20392f2ddf8a0a5959ca2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 15:35:49 2019 +0800

常见科室症状

commit ea0f58d9620813f41d86db07b3b423593889e890
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 15:35:21 2019 +0800

多选取消默认选中

commit 581d3eca1b25e0a4ce75d638291ba0c5a94b6e35
Merge: ddc468f cdc557d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 15:30:08 2019 +0800

Merge remote-tracking branch 'origin/independentTag' into dev

# Conflicts:
# src/api/config.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/PromptInfo.vue
# src/routes.js

commit cdc557d0eee2af3a58aa67bfece53cbf32c343bd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 14:54:48 2019 +0800

独立标签表格标签类型显示修改,既往史添加标签池可选类型修改

commit 44fab27447641937bfa3f934e259ddc9f9b760cf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 14:20:04 2019 +0800

症状尾巴标签池有时间单位

commit d5a9d0b0cdf2976a1d50ff484ecb5c7f6843ef66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 13:55:39 2019 +0800

下拉组件清空与下拉箭头重合修改

commit feb792b515c554af8dde2a06127d3758b2b583eb
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 13:22:48 2019 +0800

独立标签筛选类型辅捡等不显示

commit c3a666aa1af0b9c561eaa5ed589effe614e985a5
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 11:43:37 2019 +0800

后台数据typeCn转换为筛选中对应的字段名称

commit efb80b4bf9e9d8aa6298b72f8b864a671edea2b7
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 11:21:29 2019 +0800

单选无同伴同无,多选无默认选中

commit b138d164f421524e7c66ee8673102d4738078b6e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Mar 13 10:06:55 2019 +0800

术语静态知识未完

commit f0659f14489821e423f9c70564969af5edf2da2b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 13 09:16:02 2019 +0800

其他史多选的不需要显示默认选中

commit 592302ac839e01e17286f332cee2cafda9d82d78
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:50:27 2019 +0800

修改v-show为v-if

commit cb868f04f62ef05bbf2fd5038a71845a79ba75e0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:50:05 2019 +0800

血压修改问题

commit a2aa1c103fb35c7f788fe3499b22695898a1a99a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 12 18:49:37 2019 +0800

症状修改文字标签添加标识

commit ecdfcb194300b3b88f194a5a00c19aa474c7da34
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Mar 12 10:48:55 2019 +0800

医学术语静态知识维护页面添加

commit 5fb0d31284c1ea9f980ed42ee4ec0ea6e137e851
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Mar 12 10:23:29 2019 +0800

提示信息修改

commit 27e21af25e41e49ad609a06fb46157f2b635922c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 20:32:19 2019 +0800

静态知识修改

commit c4701778218a01ab699ed29be3402cc68b9ef5da
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:27:44 2019 +0800

单选异常选项修改

commit 822df8507b0c48b06e8d9b9350001cfd1f85765e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:11:18 2019 +0800

添加查体模板

commit 7658d6f547d6b067d42d4cbaebc07e46d206340f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 11 20:10:15 2019 +0800

独立标签标签归属名称

commit 7b0204b6b2fb9ab2c1adbdc29b7af8cfb68da26f
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 18:56:57 2019 +0800

提示信息详情完成

commit 5e8f323a81a735e062abbd0289fef01ed39646b3
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Mar 11 15:58:36 2019 +0800

提示信息详情删除修改-接口对接

commit 74714bd95e9ba5a0312b1afc44ca8b156d8e9f6c
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 17:44:53 2019 +0800

test

commit 2bf8231b03c8eef66abfc2e1a6f9d96c457c2e67
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 8 15:21:28 2019 +0800

提示信息添加

commit ddc468fe5f2c18dd3860ffdad97cdb3e9c8d30d8
Merge: 5033494 b809a69
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:31:28 2019 +0800

Merge branch 'dev2/luolei' into dev

commit b809a6993c8f2b4d53a921ed17ce4beb96afe714
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:30:52 2019 +0800

药品分类

commit 5033494965fd13f7511755590f106a42a08ba368
Merge: 069d57c 11280b2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:25:59 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit c17df7317718acbf2dfbde32fcc545f1ed818af8
Merge: 069d57c 11280b2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:22:38 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 11280b23fd6f56315cf8b686f9ed9279c4d92bff
Merge: 0ac18a8 c96333d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:18:52 2019 +0800

merge from 'luolei'

commit 069d57c50a1aec671dc3e6a9a531cbf07472adad
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:10:14 2019 +0800

注释

commit a380af30e459f7db199c78963f1d138747880822
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:08:58 2019 +0800

11

commit 0ac18a8c7555daba27c2693ea6dc6fd08ed94e55
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:07:50 2019 +0800

修改参数转换函数

commit 370bfc071e6e89235fee91aa495bb89b662d3713
Merge: c96333d a8359c2
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:04:12 2019 +0800

Merge branch 'dev' into dev2/luolei

commit 6074687f3d18f71e668224ca59e514b6696a558f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:04:12 2019 +0800

修改独立标签样式

commit c96333d02f1af5286ef46aab04ef104963d4bbaa
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 11:02:56 2019 +0800

样式

commit cc411cc6733931097a8cdd6b9c57b192d8935196
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:02:29 2019 +0800

Revert "修改独立标签样式"

This reverts commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9.

commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 11:01:23 2019 +0800

修改独立标签样式

commit 5ac3b253c2d3fca4de474100b650bab1b0138d61
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:55:17 2019 +0800

11

commit a8359c2a226ae695bfa22c2e480088e025fe192b
Merge: 072bc67 cb3e95b
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:32:32 2019 +0800

Merge branch 'dev2/luolei' into dev

commit cb3e95b38a46ba9e38a311f72f933c534cee104e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 8 10:31:04 2019 +0800

123456

commit bb5b301daacc785155578147f66575848d39c21f
Merge: 1b9fe73 072bc67
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:23:55 2019 +0800

merge from 'dev'

commit 1b9fe73bd1fae8e2eef414e520b985cee7c17e93
Merge: 45f3fff a28b97b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:18:52 2019 +0800

merge feom 'luolei'

commit 45f3fff542bbdb72399411b0d807c45ef53cfe9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 10:14:22 2019 +0800

查体模板维护

commit e91e545be4b9fa9eb9d3738c636b2d3be4934c50
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 8 09:56:18 2019 +0800

修改参数转换tagFlag

commit 072bc671096d52b8a4f477f562fd26340bfde0ca
Merge: 376205e a28b97b
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 17:44:22 2019 +0800

Merge branch 'dev2/luolei' into dev

commit a28b97bdbc88658bd958a9341add8f86c0c52961
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 17:39:30 2019 +0800

模板添加界面

commit cb1b285b6b482be1006e239caec531cb0bdef070
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:31:56 2019 +0800

常见科室症状添加症状

commit 2a1b26b33ac8f879bf2bd76f0b862d450651d8ba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:29:35 2019 +0800

表格添加不可拖拽属性

commit 8281112592b596ba405b5db8e49571c41e8e8d0e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 15:29:18 2019 +0800

常用科室症状上下排序

commit 4323a2cbd123f252dcf81a90fbfc304be5529d40
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 14:54:14 2019 +0800

独立标签最小年龄类型限制

commit 87a95a9d52190e088a05f0cac5c95c721c419fba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:55:58 2019 +0800

修改报错

commit ac0d7ede74d93bf0630e4b72eb029b78f3360907
Merge: 6e62e30 fda8c97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:54:16 2019 +0800

merge from 'dev2/luolei'

commit 6e62e30f3ae5cd9e72651f311584c203c2a468df
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 13:43:35 2019 +0800

归属添加药品分类

commit fda8c97ddd693aa794d87937bba640746a9439c0
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 13:43:02 2019 +0800

标签池获取问题

commit 4d0718701f413e87eec87f120249ba51127b2c1a
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 13:25:19 2019 +0800

标签组类别填写单类型9没有标签池报错问题

commit 376205ee088e63aa291e02221dcc9ebbd8b3499c
Merge: 99048a5 2f00eb8
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 7 11:41:53 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit 99048a54361560591510c2e3f79342134d9a1c29
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Mar 7 11:41:12 2019 +0800

文件服务器地址修改

commit 6930a001d2a87a04a67f2e6b35f1362b5920ff98
Merge: c6a276a 2f00eb8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:36:35 2019 +0800

merge from 'dev'

commit fcb91f06b700e7c3d84058985ad4bd89539cf092
Author: Luolei <16657115156@163.com>
Date: Thu Mar 7 11:31:38 2019 +0800

新增模板维护系统

commit c6a276a09579b4478c1fb5c7e6aaabb7fcdef4ea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:23:13 2019 +0800

修改标签组添加是否显示加号和是否复制子标签字段

commit 3869532cff2a3c176935a9498def94f5384820ee
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 11:13:28 2019 +0800

添加常用科室症状

commit 2f00eb8a4baee7dae8bdf11986f139f692c3376d
Merge: 0c12c5e 0fe383a
Author: liucf <liucf@zjlantone.com>
Date: Thu Mar 7 09:58:35 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit ae8596b1e19d3b46939535694342d2b63e7bd270
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Mar 7 09:16:44 2019 +0800

修改独立标签添加/修改标题

commit 0c12c5e77187de09015015fc95bc5072cb967097
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 6 16:49:04 2019 +0800

合并depart分支
Squashed commit of the following:

commit 49f3af28dbb3e149975a326ba706b0fc1e9544c4
Author: liucf <liucf@zjlantone.com>
Date: Wed Mar 6 16:42:01 2019 +0800

合并dev
Squashed commit of the following:

commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
Merge: 6dde00e f2ad245
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:15:37 2019 +0800

Merge branch 'dev2/luolei' into dev

commit f2ad24529f7716a96e6e01c57056343fcd516473
Merge: e0223af 76dfc4f
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:13:37 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 11:12:15 2019 +0800

修改标签组参数转换

commit 365b676fb3adfb19828a6295b94527da158b0a56
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 10:52:38 2019 +0800

修改独立标签没有修改不能保存问题

commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 16:46:45 2019 +0800

token失效问题

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/icss.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/LabelGroup.vue
# src/components/icss/PubTagGroup.vue

commit 19f3f1de0e04cf8c4e4980713c886087b72f22b9
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 5 16:52:40 2019 +0800

合并dev分支,并统一分页样式和删除颜色
Squashed commit of the following:

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/icss.js
# src/components/icss/IndeptLabel.vue
# src/components/icss/InspactTagGroup.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubTagGroup.vue
# src/components/icss/SymptomPush.vue
# src/components/icss/SymptomTagGroup.vue

commit e6f42e9e126128ec189ebc2505abd3a432bd01d6
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 5 16:10:22 2019 +0800

免责声明、详情、添加修改、启用停用

commit f142c2dc630547b619612ed97270a9ff4a3221e0
Author: liucf <liucf@zjlantone.com>
Date: Mon Mar 4 21:02:41 2019 +0800

添加免责声明
Squashed commit of the following:

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/config.js
# src/api/icss.js
# src/api/utils.js
# src/components/icss/BloodPressTagGroup.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubTagGroup.vue
# src/components/icss/PubTagPartDetail.vue
# src/components/icss/SymptomTagGroup.vue
# src/routes.js

# Conflicts:
# src/components/icss/IndeptLabel.vue
# src/components/icss/LabelGroup.vue

commit 4340f9c1e06625f368d3acf2c81f10797a50d74c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 14:18:37 2019 +0800

常见科室症状

commit 0fe383a169541a4af26341a94dbdcca18026b9a9
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 13:33:31 2019 +0800

标题修改

commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
Merge: 6dde00e f2ad245
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:15:37 2019 +0800

Merge branch 'dev2/luolei' into dev

commit f2ad24529f7716a96e6e01c57056343fcd516473
Merge: e0223af 76dfc4f
Author: Luolei <16657115156@163.com>
Date: Wed Mar 6 11:13:37 2019 +0800

Merge branch 'dev2/zhangxc' into dev2/luolei

commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 11:12:15 2019 +0800

修改标签组参数转换

commit 365b676fb3adfb19828a6295b94527da158b0a56
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Mar 6 10:52:38 2019 +0800

修改独立标签没有修改不能保存问题

commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 16:46:45 2019 +0800

token失效问题

commit 36d73051401858000de44211f71d931d0b061e6e
Merge: 28fdc7d b1feaf1
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:10:10 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 11:05:01 2019 +0800

独立标签分页样式

commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
Merge: 216dd81 28336ac
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 11:03:07 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
Merge: db78e24 1c7e1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:59:41 2019 +0800

merge from 'lcf'

commit db78e24b427d92b0a8aa9d774deb2bad253912a7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:49:32 2019 +0800

症状推送类样式修改

commit 09a0e94857dab141bdc5740d74550a3daf4efaea
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:33:59 2019 +0800

修改底部分页宽度

commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
Merge: 7d489cf e0223af
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:28:44 2019 +0800

Merge branch 'dev2/luolei' into dev

commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 10:26:04 2019 +0800

去掉类型判断

commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
Merge: 69f1559 3cb5b42
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:24:20 2019 +0800

Merge branch 'dev' into dev2/zhangxc

commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
Merge: b232857 0e7f672
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 10:22:12 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit b2328579f94768eaca1a20191733639b07343235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Mar 5 09:49:21 2019 +0800

底部分页添加最小宽度

commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
Merge: 51c17f1 0e7f672
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:54 2019 +0800

Merge branch 'dev2/luolei' into dev

commit 51c17f117d137e82c82a0883d546e17063a1a180
Author: Luolei <16657115156@163.com>
Date: Tue Mar 5 09:39:39 2019 +0800

富文本编辑依赖添加

commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:33:14 2019 +0800

修改操作界面样式

commit 457d83209b5c780554eeee8accf88e4c1630394a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 16:16:44 2019 +0800

症状推送添加标签标识

commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
Merge: bfdb2a4 de516f0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 13:09:42 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 10:34:54 2019 +0800

症状推送有内容显示状态

commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
Author: Luolei <16657115156@163.com>
Date: Mon Mar 4 09:25:40 2019 +0800

删除console

commit 9d5e136b249f446288db7f42347d829ff995c901
Merge: 5aa2bdc 83920a9
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:57:05 2019 +0800

Merge remote-tracking branch 'origin/dev2/luolei' into dev

commit 83920a95b2a26706470d5effd09e14dc60aec472
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:52:56 2019 +0800

报错问题

commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
Merge: e1b7e26 73440ab
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:33:02 2019 +0800

Merge remote-tracking branch 'origin/dev2/zhangxc' into dev

commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
Merge: 163e4c9 de516f0
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:32:42 2019 +0800

Merge branch 'test' into dev

# Conflicts:
# src/api/icss.js

commit 73440abf636577fda0d05524180791434ca727b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 17:03:31 2019 +0800

症状推送

commit de516f030d664bb82787ae5a35f68515237ab4c4
Merge: 4c3985a aebb7f7
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:39:30 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 4c3985ae9ebe589d36c352b579501681f060b795
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 16:19:02 2019 +0800

限制调用时机

commit f0d48657fba60ba4fd72c031b8368b7c67efc619
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 16:15:33 2019 +0800

noIds添加判断

commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
Merge: 8324bf6 f9a0af3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:43:24 2019 +0800

Merge branch 'dev2/luolei' into dev2/zhangxc

commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:42:41 2019 +0800

症状推送(未完成)

commit f9a0af3b869f1e84296e4630293ae99532e35155
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 15:40:56 2019 +0800

合并问题

commit aad93151bf13fb20e8b732369d05452e62d05c17
Merge: f61ed45 cad991f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:08:39 2019 +0800

merge from 'luolei'

commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 15:01:33 2019 +0800

症状推送及其修改(未完成)

commit aebb7f75c35177143468f1c70c43738de296363e
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 14:32:58 2019 +0800

多次调用问题解决

commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:40:18 2019 +0800

修改完成,参数统一配置

commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:20:45 2019 +0800

配置项修改

commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:09:38 2019 +0800

添加富文本编辑器

commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 16:03:58 2019 +0800

标签组修改

commit 78b130de9259175f18e1c2e06a61188c35ddb864
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 15:08:40 2019 +0800

判断有误

commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
Merge: 77a9c8c a0b68ed
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:47:20 2019 +0800

merge from 'dev2/luolei'

commit 77a9c8c7c09e2981265d35abc5425484d9519783
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 14:41:59 2019 +0800

标签组修改(血压和症状)

commit a0b68ed4950b1a6fa297aa3828229e7561631978
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:40:44 2019 +0800

修改

commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 20:25:47 2019 +0800

提示信息维护

commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:51:54 2019 +0800

标签组修改标签组公共数据部分

commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:37:03 2019 +0800

初始化时填写单类型赋值

commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 15:36:02 2019 +0800

删除联合推送标签明细项

commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 14:34:32 2019 +0800

标签组添加限制条件

commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 15:08:17 2019 +0800

修改归属,填写单类型,性别,标签明细重置

commit 061de293c240f35ad7e82056d57d846c8f3cb531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 13:57:28 2019 +0800

修改归属为化验类别为多选时标签显示

commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 22 10:57:15 2019 +0800

化验和多选框

commit a4724d13390450886b82d650e703095dada8a401
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 11:08:15 2019 +0800

修改标签类型和归属显示名称

commit b448a51594240b8b0da025ee9a823c4577e2d18a
Merge: 0b52ec6 db7e04f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 17:15:00 2019 +0800

Merge branch 'test' into dev2/zhangxc

commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 13:08:58 2019 +0800

和单标签

commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:59 2019 +0800

修改bug

commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:30:39 2019 +0800

修改标签池标签名称样式

commit 3663d6490026fc3f4fab92f3966dec703705a017
Merge: 7aec89a 43e196f
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 10:13:29 2019 +0800

Merge branch 'dev2/luolei' into independentTag

commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 10:08:57 2019 +0800

修改标签名称样式

commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 17:26:43 2019 +0800

bug修改

commit 7aec89ad1af7201574105b99f0636c44e91a69e2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:32:54 2019 +0800

禁用传值布尔型

commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:28:50 2019 +0800

修改标签归属、类型和性别不可改

commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 13 16:22:22 2019 +0800

单选标签修改

commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 11:20:22 2019 +0800

文本类型修改,单选类型修改未完

commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 18:10:47 2019 +0800

单选维护属性tag显示

commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 17:35:26 2019 +0800

输入框类型维护

commit 082c91207349481dd5bbc13de511d46d212d83ea
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 16:37:36 2019 +0800

单选维护bug修改

commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 11 14:53:29 2019 +0800

单选标签属性选项置灰

commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
Merge: 7b95e36 d8f8c68
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 10:04:46 2019 +0800

Merge branch 'dev' into independentTag

commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
Merge: e2dd153 ba5e9e6
Author: zhouna <zhouna@zjlantone.com>
Date: Sun Feb 3 09:48:48 2019 +0800

Merge remote-tracking branch 'origin/dev' into dev

commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
Author: zhouna <zhouna@zjlantone.com>
Date: Sat Feb 2 17:30:26 2019 +0800

单选维护

commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 17:57:41 2019 +0800

独立标签

commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
Merge: 6568234 c1ca617
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 15:29:27 2019 +0800

Merge remote-tracking branch 'origin/depart' into independentTag

commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:12:44 2019 +0800

bug修改

commit c4b0acf690b308b061c567aaa3620bd02879ec29
Merge: 34570c5 b77e984
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:17 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 34570c5385b33631c74c29db58d02faad21367b0
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 17:23:09 2019 +0800

bug修改

commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
Merge: 93ce48b ba5e9e6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:36:20 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:35:33 2019 +0800

修改顶部标题样式

commit 93ce48bda37148c865cb0b305a6e645f8418badd
Merge: 148d49f db0659a
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:23:42 2019 +0800

Merge branch 'dev2/luolei' into test

commit db0659aab84a70449bb5b5c61a9084463554b100
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:22:51 2019 +0800

优化

commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
Merge: 3e9010f 60307c5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:19:38 2019 +0800

Merge branch 'dev2/zhangxc' into test

commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:18:06 2019 +0800

修改横铺统一(血压)为每个后面添加一个输入框

commit 3e9010f66dc1ad911c37486615ea5423be2c9285
Merge: 77d8884 f04c384
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:16:48 2019 +0800

Merge branch 'dev2/luolei' into test

commit f04c384d802839228bc2f74fb7dc65ede83a1775
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 15:15:12 2019 +0800

互斥项

commit 77d88846790cf2166999d602a6890d6ef4422190
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:06:13 2019 +0800

修改左右箭头位置

commit 714eba80c300c481857d0df5285a86944c4469e0
Merge: 969688f 3fe9e97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:58 2019 +0800

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

commit 969688f82f0f869e5eafdc40263054c83cf0093d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 15:01:49 2019 +0800

修改标签属性删除

commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 14:34:44 2019 +0800

保存忘打开了

commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
Merge: 58d39fc 3f48de8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:55 2019 +0800

Merge branch 'dev' into test

commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
Merge: bf43109 025ac3d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:24:36 2019 +0800

Merge branch 'dev2/zhangxc' into dev

commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 13:22:17 2019 +0800

修改操作池样式

commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 13:18:04 2019 +0800

去掉既往史下面的提示

commit 2964171fec51793f979776c433cede0594777d96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 11:13:21 2019 +0800

修改性别清除标签明细

commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:41:53 2019 +0800

不区分单选多选

commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:13:39 2019 +0800

去掉弹窗

commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
Merge: e0ae7ed 393d9e4
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:23 2019 +0800

Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
Author: Luolei <16657115156@163.com>
Date: Thu Jan 31 10:11:13 2019 +0800

添加参数,默认值修改

commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 31 09:53:55 2019 +0800

修改样式

# Conflicts:
# src/api/config.js
# src/api/icss.js
# vue.config.js

liucf 6 tahun lalu
induk
melakukan
4a1827385c

File diff ditekan karena terlalu besar
+ 2073 - 2016
package-lock.json


+ 4 - 1
package.json

@@ -9,7 +9,9 @@
   },
   "dependencies": {
     "js-md5": "^0.7.3",
-    "vue": "^2.5.17"
+    "quill-image-extend-module": "^1.1.2",
+    "vue": "^2.5.17",
+    "vue-quill-editor": "^3.0.6"
   },
   "eslintConfig": {
     "env": {
@@ -29,6 +31,7 @@
     "less-loader": "^4.1.0",
     "path": "^0.12.7",
     "qs": "^6.5.2",
+    "quill-image-extend-module": "^1.1.2",
     "vue-router": "^3.0.1",
     "vue-template-compiler": "^2.5.17",
     "vue-ueditor-wrap": "^2.4.0"

+ 17 - 7
src/api/config.js

@@ -1,5 +1,6 @@
 export default {
-  host:'http://192.168.3.100:5050',
+  host:'http://192.168.2.241:5050',
+  imgHost:'http://192.168.2.241:82',      //富文本编辑器图片回传地址
   urls: {
     /* 登录注册相关接口 */
     'getImgVerification': '/api/user/userver/getImgVerification',
@@ -132,7 +133,7 @@ export default {
     'getPhysicalExamTempByDepId':'api/icssman/deptVital/getModuleByDeptId', //通过科室id获取查体模板
     'savePhysicalExamTemp':'api/icssman/deptVital/saveDeptVitals',//保存查体模板
     'delPhysicalExamTemp':'api/icssman/deptVital/delAllDeptVitalList',//删除查体模板
-    'getConceptKnowledgeList':'/api/knowledgeman/Knowledge/getAllKnowledge', //  术语静态知识列表
+    'getConceptKnowledgeList':'/api/knowledgeman/libraryDetail/getLibraryDetailList', //  术语静态知识列表
     'getConceptKnowledge':'/api/knowledgeman/Knowledge/getConceptKnowledge',//术语静态知识查询
     'getConceptInfo':'/api/knowledgeman/concept/getConceptInfo', //  搜索术语
     'getAllConcept':'/api/knowledgeman/concept/getAllConcept', //  术语列表
@@ -143,9 +144,10 @@ export default {
     'addVersionInfo': 'api/icssman/versionDetail/addVersionDetails', //版本信息-添加版本说明
     'modiVersionInfo': 'api/icssman/versionDetail/updateVersionDetails', //版本信息-修改版本说明
     'getVersionDetlInfo': 'api/icssman/versionDetail/getDetailById', //版本信息-版本说明列表获取
+    'promptServer':'/api/icssman/file/uploadImage',    //静态知识
     /**************医学术语维护****************/
-	'saveConceptInfo':'/api/knowledgeman/Knowledge/upsertConceptKnowledge',   //保存术语静态知识
-    'delConceptInfo':'/api/knowledgeman/Knowledge/removeConceptKnowledge',   //删除术语静态知识
+	  'saveConceptInfo':'/api/knowledgeman/libraryDetail/addLibraryDetail',   //保存术语静态知识
+    'delConceptInfo':'/api/knowledgeman/libraryDetail/removeLibraryDetail',   //删除术语静态知识
     'knowledgeName': 'api/knowledgeman/concept/getAllInformation', //医学术语-命名维护
     'knowledgeUpload': 'api/knowledgeman/concept/conceptInfoExcelIm', //医学术语-命名维护-导入
     'allKnowledgeType': 'api/knowledgeman/lexicon/getAllLexicon', //医学术语-类型列表
@@ -158,8 +160,16 @@ export default {
     'addRelationConcept': 'api/knowledgeman/relation/addRelationInfo', //医学术语-关系维护-添加
     'RelationUpload': 'api/knowledgeman/relation/relationInfoExcelIm', //医学术语-关系维护-导入
     'getAllConcept': 'api/knowledgeman/concept/getAllConcept', //查询所有术语名称
-    'getTypeList': 'api/knowledgeman/lexicon/getLexiconList', //术语类型-列表
+	'getTypeList': 'api/knowledgeman/lexicon/getLexiconList', //术语类型-列表
     'addType': 'api/knowledgeman/lexicon/addLexicon', //术语类型-添加
+    'getMedicalInfoList': 'http://192.168.3.101:5050/api/knowledgeman/medical/getMedicalInfoList', //医学术语--属性维护--属性列表
+    'medicalInfoExcelIm': 'http://192.168.3.101:5050/api/knowledgeman/medical/medicalInfoExcelIm', //医学术语--属性维护-术语医学属性excel文件导入
+    'getMedicalInfoDetail': 'http://192.168.3.101:5050/api/knowledgeman/medical/getMedicalInfoDetail', //医学术语--属性维护--属性详情
+    'addMedicalInfo': 'http://192.168.3.101:5050/api/knowledgeman/medical/addMedicalInfo', //医学术语--属性维护--术语医学属性添加或者编辑
+    'removeMedicalInfo': 'http://192.168.3.101:5050/api/knowledgeman/medical/removeMedicalInfo', //医学术语--属性维护--术语医学属性删除
+    'getAllLexiconRelationship':'http://192.168.3.101:5050/api/knowledgeman/lexicon/getAllLexicon', //医学术语--获取所有关系类型
+    'getAllConcept':'http://192.168.3.101:5050/api/knowledgeman/concept/getAllConcept',   //医学术语--获取所有概念(标准术语)
+    'getAllBodypart': 'http://192.168.3.101:5050/api/knowledgeman/bodypart/getAllBodypart'  //医学术语--获取所有部位
 	},
 	menuIconList: { //菜单对应图标
 		'YH-KZT': 'el-icon-menu',
@@ -182,8 +192,8 @@ export default {
   },
   groupParams:[
     {controlType:[1,2],tagType:[1],notTagType:[8]},     //多列多选(杂音/初为)     notTagType为文字标签剔除
-    {controlType:[0,1,2,5,6,7],tagType:[1,2],notTagType:[8]},  //多项统一横铺标签(血压)
-    {controlType:[0,1,2,5,6,7],tagType:[1,2],notTagType:[8]},  //症状详细(症状尾巴)
+    {controlType:[1,2,5,6,7,11],tagType:[1,2],notTagType:[8]},  //多项统一横铺标签(血压)
+    {controlType:[0,1,2,5,6,7,11],tagType:[1,2],notTagType:[8]},  //症状详细(症状尾巴)
     {controlType:[0,1,2],tagType:[1,2,3,4],notTagType:[2,8]}, //组合项标签(既往史)
     {controlType:[1,6],tagType:[],notTagType:[8]},    //化验组合
     {controlType:[1,2,99],tagType:[],notTagType:[8]},   //症状推送类型(添加症状)

+ 30 - 3
src/api/icss.js

@@ -25,6 +25,9 @@ export default {
     getPrompDetail(param){
       return axios.post(urls.PromptInfoDetail,param);
     },
+    getAllType(){
+      return axios.post(urls.allKnowledgeType,{size:10});
+    },
     getTremList(param){
       return axios.post(urls.getConceptKnowledge,param);
     },
@@ -120,8 +123,8 @@ export default {
     commonSymptomList(param) {  //常见症状维护-常见症状列表
         return axios.post(urls.commonSymptomList, param)
     },
-    getDepartmentList() {   //常见症状维护-获取科室列表
-        return axios.post(urls.getDepartmentList)
+    getDepartmentList(param) {   //常见症状维护-获取科室列表
+        return axios.post(urls.getDepartmentList, param)
     },
     getSymptomList(param) {
         return axios.post(urls.getSymptomList, param)
@@ -250,7 +253,31 @@ export default {
     getAllConcept(param) {//查询所有术语名称
         return axios.post(urls.getAllConcept, param)
     },
-    getTypeList(param) {//术语类型-列表
+    getMedicalInfoList(param) { //医学术语--属性维护--属性列表
+        return axios.post(urls.getMedicalInfoList, param)
+    },
+    medicalInfoExcelIm(param) { //医学术语--属性维护--//医学术语--属性维护-术语医学属性excel文件导入
+        return axios.post(urls.medicalInfoExcelIm, param)
+    },
+    getMedicalInfoDetail(param) { //医学术语--属性维护--属性详情
+        return axios.post(urls.getMedicalInfoDetail, param)
+    },
+    addMedicalInfo(param) { //医学术语--属性维护--术语医学属性添加或者编辑
+        return axios.post(urls.addMedicalInfo, param)
+    },
+    removeMedicalInfo(param) { //医学术语--属性维护--术语医学属性删除
+        return axios.post(urls.removeMedicalInfo, param)
+    },
+    getAllLexiconRelationship(param) {   //医学术语--获取所有术语类型
+        return axios.post(urls.getAllLexiconRelationship, param)
+    },
+    getAllConcept(param) {  //医学术语--获取所有概念(标准术语)
+        return axios.post(urls.getAllConcept, param)
+    },
+    getAllBodypart(param) {
+        return axios.post(urls.getAllBodypart, param)
+    },
+	getTypeList(param) {//术语类型-列表
         return axios.post(urls.getTypeList, param)
     },
     addType(param) {//术语类型-添加

+ 3 - 0
src/api/utils.js

@@ -148,6 +148,8 @@ export default {
           tmpArr.push(mapping)
         }
       } else if(type == 11) {    //推送症状类型(添加症状)
+        mapping.formPosition = 0;
+        mapping.exclusionType = 0;
         mapping.sonQuestion = dataArr[i].id
         tmpArr.push(mapping)
       }
@@ -232,6 +234,7 @@ export default {
       }else{    //这个是标签
         obj.questionId = data[i].id
       }
+      obj.flag = data[i].flag || ''
       tmpArr.push(obj)
     }
     return tmpArr;

+ 49 - 21
src/components/icss/AddCommonSymptom.vue

@@ -6,14 +6,14 @@
             @click="back"
         ></i> 常见症状维护系统--{{titleText}}</div>
         <el-form :model="form" ref="ruleForm" :rules="rules" class="addDepartForm">
-            <el-form-item label="选择科室" prop="department">
-                <el-select :disabled="isEdit || isDetail" v-model="form.department" placeholder="请添加科室" @change="changeDept" class="selectDepart">
-                    <el-option v-for="item in departList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
              <el-form-item label="选择类型" prop="type">
                 <el-select :disabled="isEdit || isDetail" v-model="form.type" placeholder="请选择类型"  @change="changeType" class="selectDepart">
-                    <el-option v-for="item in typeList" :key="item.type" :label="item.typeName" :value="item.type"></el-option>
+                    <el-option v-for="item in typeList" :key="item.key" :label="item.name" :value="item.key"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="选择科室" prop="department">
+                <el-select :disabled="isEdit || isDetail || !form.type" v-model="form.department" placeholder="请添加科室" @change="changeDept" class="selectDepart">
+                    <el-option v-for="item in departList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
         </el-form>
@@ -87,7 +87,7 @@
         return{
             rules: {
                 department:[{required: true, message: '请选择科室', trigger: ['blur']}],
-                type:[{required: true, message: '请选择科室', trigger: ['blur']}]
+                type:[{required: true, message: '请选择类型', trigger: ['blur']}]
             },
             form: {
                 department: '',
@@ -95,7 +95,12 @@
             },
             titleText: '添加科室常见症状',
             departList: [],
-            typeList:[],
+            typeList:[
+                 {
+                    "name": "症状",
+                    "key": 1
+                },
+            ],
             searchVal: '',
             isEdit: false,
             isDetail: false,
@@ -127,6 +132,7 @@
             
         } else {
             this.getDepartmentList()
+            // this.getIcssEnumsData()
         }
     },
     watch: {
@@ -142,8 +148,18 @@
         back(){
             this.$router.go(-1);
         },
+        getIcssEnumsData()  {
+            api.getIcssEnumsData().then((res) => {
+                if(res.data.code === '0') {
+                   this.typeList = res.data.data.questionUsualTypeEnum
+                }
+            })
+        },
         getDepartmentList() {
-            api.getDepartmentList().then((res)=>{
+            const param = {
+                "type": this.form.type
+            }
+            api.getDepartmentList(param).then((res)=>{
                if(res.data.code === '0') {
                    this.departList = res.data.data
                 }
@@ -158,7 +174,8 @@
                 "deptId": this.form.department,
                 "tagName": this.searchVal,
                 "noIds": noIds,
-                "type": this.form.type
+                "type": this.form.type,
+                "notTagType": [8],
             }
             api.getSymptomList(param).then((res)=>{
                if(res.data.code === '0') {
@@ -167,13 +184,13 @@
             })
         },
         changeDept() {
-            this.form.type = ''
-            this.typeList = this.departList.filter(item => this.form.department == item.id)[0].typeDTOList
             this.clearData()
+            this.getSymptomList()
         },
         changeType() {
+            this.form.department = ''
+            this.getDepartmentList()
             this.clearData()
-            this.getSymptomList()
         },
         clearData() {
             this.leftTagsList = [];
@@ -204,7 +221,7 @@
             }
             this.rightTagsList.splice(this.selectRightTagIndex, 1)
             this.selectLeftTagsList = [];
-            this.selectRightTagIndex = -1;
+            this.selectRightTagIndex -= 1;
             this.getSymptomList()
 
         },
@@ -215,7 +232,7 @@
             const tempItem = this.rightTagsList[this.selectRightTagIndex]
             this.rightTagsList.splice(this.selectRightTagIndex, 1)
             this.rightTagsList.splice(this.selectRightTagIndex-1, 0,tempItem)
-            this.selectRightTagIndex = -1
+            this.selectRightTagIndex -= 1
         },
         toDown(){
              if(this.selectRightTagIndex === this.rightTagsList.length-1 || this.selectRightTagIndex === -1) {
@@ -224,7 +241,7 @@
             const tempItem = this.rightTagsList[this.selectRightTagIndex]
             this.rightTagsList.splice(this.selectRightTagIndex, 1)
             this.rightTagsList.splice(this.selectRightTagIndex+1, 0,tempItem)
-            this.selectRightTagIndex = -1
+            this.selectRightTagIndex += 1
 
         },
 
@@ -243,8 +260,13 @@
             return this.isHasTag(item, this.selectRightTagsList)
         },
         submitForm(formName) {
-           
-            this.$refs[formName].validate((valid) => {
+            if(this.isDetail) {
+                this.$router.push({
+                        path:'/admin/LT-YXSJWH-CJZZWH'
+                })
+                return;
+            }
+            const valided = this.$refs[formName].validate((valid, callback) => {
                 if (valid) {
                     return
                 } else {
@@ -252,9 +274,13 @@
                     return false;
                 }
             });
-             if(!this.form.department) {
+             if(!this.form.department || !this.form.type) {
                 return 
             }
+            if(this.rightTagsList.length === 0) {
+                this.warning('请选择常见选项标签')
+                return
+            }
             this.showDelDialog()
         },
         showDelDialog() {
@@ -264,10 +290,11 @@
             }
             const param ={
                 "deptId": this.form.department,
-                "questionId": questionId
+                "questionId": questionId,
+                "type": this.form.type,
    
             }
-            this.showConfirmDialog('是否保存该标签组?', () => {
+            this.showConfirmDialog('是否保存常见选项内容?', () => {
                 api.addCommonSymptom(param).then((res) => {
                 if (res.data.code  === '0') {
                     this.warning(res.data.msg || '保存成功', 'success','1000')
@@ -387,6 +414,7 @@
             width: 100%;
             height: 340px;
             padding: 10px 0;
+            overflow-y: auto;
         }
         .btn {
             position: relative;

+ 28 - 12
src/components/icss/AddIndeptLabel.vue

@@ -13,7 +13,10 @@
                 ref="submitForm"
         ></PubIndeptTag>
         <div class="main">
-            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2"> <i>*</i> 标签明细:</p>
+            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2|| dataPub.region2==11">
+                <i>*</i> 标签明细:
+                <i v-if='dataPub.region2==2' style="margin-left:70px;color: #22ccc8; font-size: 12px;">所有选项必须都有或者都没有同“伴”/“无”标记</i>
+            </p>
             <SingleSelect v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==11" :ascription="dataPub.region1" :sexType="dataPub.region7" :type="dataPub.region2" @pushValues="pushValues" :options="editData.questionDetailList"></SingleSelect>
             <div class="btn">
                 <el-button
@@ -81,7 +84,7 @@
         //console.log(sex)
       },
       changeType(type) {        //填写单类型改变,标签明细左侧更新,右侧清空
-        // console.log(type)
+        // console.log('type',type)
         this.options = [];
       },
       pushValues(its){
@@ -94,6 +97,7 @@
         //仍需验证标签明细是否选择
         let isNull = true
         let options2 = []
+        const opts = this.options;
         for (let i = 0; i < this.options.length; i++) {
           if(this.options[i].name.trim() != '') {
             isNull = false
@@ -102,17 +106,29 @@
         }
         this.options = options2;
         if(this.itemsTypes.includes(+this.dataPub.region2)&&isNull) {
-            this.$message({
-              message: '至少填一个选项',
-              type: 'warning'
-            });
+            this.warning('至少填一个选项')
             return;
         }
-        if(this.dataPub.region8 >= this.dataPub.region9) {
-          this.$message({
-            message: '最小年龄不能大于或等于最大年龄',
-            type: 'warning'
-          });
+        let flag=true;
+        if(opts[0] && opts[0].code){
+          flag=opts.findIndex((it)=>{
+            return !it.code;
+          })==-1;
+        }else{
+          flag=opts.findIndex((it)=>{
+            return it.code;
+          })==-1;
+        }
+        if(!flag){
+          this.warning('所有选项必须都有或者都没有同“伴”/“无”标记')
+          return;
+        }
+        if(parseFloat(this.dataPub.region8) >= parseFloat(this.dataPub.region9)) {
+          this.warning('最小年龄不能大于或等于最大年龄')
+          return;
+        }
+        if(parseFloat(this.dataPub.minNormalVal) >= parseFloat(this.dataPub.maxNormalVal)) {
+          this.warning('最小正常值不能大于或等于最大正常值')
           return;
         }
         const {isEdit,data} = this.$route.params;
@@ -125,7 +141,7 @@
             "tagName": this.dataPub.region3,             //系统名称
             "name": this.dataPub.region4,                //界面名称
             "joint": this.dataPub.region5,               //标签间的连接符
-            "subType": this.dataPub.region6,   	         //0:可以,1:不可以(当项目检索)
+            // "subType": this.dataPub.region6,   	         //0:可以,1:不可以(当项目检索)  //这个字段暂时不用
             "sexType": this.dataPub.region7,             //1:男,2:女,3:通用
             "ageBegin": this.dataPub.region8,       		 //最小年龄
             "ageEnd": this.dataPub.region9,              //最大年龄

+ 500 - 132
src/components/icss/AddMedicalInfo.vue

@@ -9,91 +9,181 @@
                      :model="form"
                      label-width="130px"
                      ref="groups">
-                <el-form-item label="选择概念:"  prop = "concept">
-                   <el-select v-model="form.concept" clearable placeholder="请选择" size="small">
-                        <el-option
-                            v-for="item in conceptList"
-                            :key="item.key"
-                            :label="item.name"
-                            :value="item.key">
-                        </el-option>
-                    </el-select>
+                <el-form-item label="搜索概念:">
+                  <div class="conceptSearch">
+                    <input v-model="conceptText" type="text" class="searchText">
+                    <span class="searchName" @click="searchConcept">搜索</span>
+                    <ul class="conceptList" ref="conceptList">
+                      <li 
+                        v-for="item in conceptList" 
+                        class="conceptItem ellipsis"
+                        :title="item.nameAndType"
+                        @click="selectConcept(item)"
+                        :key="item.id">
+                        {{item.nameAndType}}
+                      </li>
+                    </ul>
+                  </div>
                 </el-form-item>
-                <el-form-item label="选择类型:" prop="type">
-                   <el-select v-model="form.type" clearable placeholder="请选择" size="small">
-                        <el-option
-                            v-for="item in typeList"
-                            :key="item.key"
-                            :label="item.name"
-                            :value="item.key">
-                        </el-option>
-                    </el-select>
+
+
+                <el-form-item label="选择概念:"  prop = "concept"  class="required">
+
+                      <el-input v-model="form.concept" disabled></el-input>
+                      <!-- <el-select v-model="form.concept"   filterable  @change="selectConcept" placeholder="请选择" size="small">
+                          <el-option
+                              v-for="(item) in conceptList"
+                              :key="item.id"
+                              :label="item.nameAndType"
+                              :value="item.id">
+                          </el-option>
+                      </el-select> -->
+                   
                 </el-form-item>
-                <el-form-item label="术语名称:" prop="termName">
+                <el-form-item label="选择类型:" prop="type"  class="required">
+                        <el-input disabled v-model="form.conceptType"></el-input>
+                </el-form-item>
+               
+                <!-- <el-form-item label="术语名称:" prop="termName">
                    <el-input v-model="form.termName"></el-input>
+                </el-form-item> -->
+                 <el-form-item label="术语标准名称:" prop="termStandardName"  class="required">
+                   <el-input disabled v-model="form.stdName"></el-input>
+                </el-form-item>
+                <el-form-item label="搜索小类名称:" >
+                  <div class="conceptSearch  termMiniClassSearch">
+                    <input v-model="termMiniClassText" type="text" class="searchText">
+                    <span class="searchName" @click="searchTermMiniClass">搜索</span>
+                    <ul class="conceptList" ref="termMiniClassNameList">
+                      <li 
+                        v-for="item in termMiniClassNameList" 
+                        class="conceptItem ellipsis"
+                        :title="item.nameAndType"
+                        @click="selectTermMiniClass(item)"
+                        :key="item.id">
+                        {{item.nameAndType}}
+                      </li>
+                    </ul>
+                  </div>
                 </el-form-item>
-                 <el-form-item label="术语标准名称:" prop="termStandardName">
-                   <el-input v-model="form.termStandardName"></el-input>
+                 <el-form-item label="术语小类名称:" prop="termMiniClassName"  class="required">
+                   <el-input disabled v-model="form.termMiniClassName"></el-input>
+                   <!-- <el-select v-model="form.termMiniClassName"   filterable  placeholder="请选择" size="small">
+                        <el-option
+                            v-for="(item) in termClassList"
+                            :key="item.id"
+                            :label="item.nameAndType"
+                            :value="item.name">
+                        </el-option>
+                    </el-select> -->
                 </el-form-item>
-                 <el-form-item label="术语小类名称:" prop="termMiniClassName">
-                   <el-input v-model="form.termMiniClassName"></el-input>
+                 <el-form-item label="搜索术语类组:">
+                  <div class="conceptSearch termClassSearch">
+                    <input v-model="termClassText" type="text" class="searchText">
+                    <span class="searchName" @click="searchTermClass">搜索</span>
+                    <ul class="conceptList" ref="termClassList">
+                      <li 
+                        v-for="item in termClassList" 
+                        class="conceptItem ellipsis"
+                        :title="item.nameAndType"
+                        @click="selectTermClass(item)"
+                        :key="item.id">
+                        {{item.nameAndType}}
+                      </li>
+                    </ul>
+                  </div>
                 </el-form-item>
-                <el-form-item label="术语类组:" prop="termClass">
-                   <el-input v-model="form.termClass"></el-input>
+                <el-form-item label="术语类组:" prop="termClass"  class="required">
+                   <el-input disabled v-model="form.termClass"></el-input>
+                   <!-- <el-select v-model="form.termClass"   filterable  placeholder="请选择" size="small">
+                        <el-option
+                            v-for="(item) in termClassList"
+                            :key="item.id"
+                            :label="item.nameAndType"
+                            :value="item.name">
+                        </el-option>
+                    </el-select> -->
                 </el-form-item>
-                <el-form-item label="性别:" prop="sex">
+                <el-form-item label="性别:" prop="sex"  class="required">
                    <el-select v-model="form.sex" clearable placeholder="请选择" size="small">
                         <el-option
-                            v-for="item in typeList"
-                            :key="item.key"
-                            :label="item.name"
-                            :value="item.key">
+                            v-for="item in sexList"
+                            :key="item.sex"
+                            :label="item.sex"
+                            :value="item.val">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item
                     label="年龄"
-                    class="fix-inp"
+                    class="fix-inp required"
                     prop="age"
                 >
                     <el-col :span="10">
+                      <el-form-item
+                         prop="minAge"
+                      >
                         <el-input v-model="form.minAge"
                                 maxLength="3"
+                                type="number"
+                                
                         ></el-input>
+                      </el-form-item>
+                        
                     </el-col>
                     <el-col :span="4">~</el-col>
                     <el-col :span="10">
+                      <el-form-item
+                         prop="maxAge"
+                      >
                         <el-input
                             v-model="form.maxAge"
+                            type="number"
                             maxLength="3"
                         ></el-input>
+                      </el-form-item>
                     </el-col>
                 </el-form-item>
-                <el-form-item label="一级部位:" prop="primarySite">
-                    <el-select v-model="form.primarySite" clearable placeholder="请选择" size="small">
+                <el-form-item label="一级部位:" prop="primarySite" class="required">
+                    <el-select v-model="form.primarySite" clearable placeholder="请选择" @change="selectPrimarySite" size="small">
                         <el-option
-                            v-for="item in typeList"
+                            v-for="item in primarySiteList"
                             :key="item.key"
                             :label="item.name"
-                            :value="item.key">
+                            :value="item.name">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="二级部位:" prop="twoLevelPosition">
+                <el-form-item label="二级部位:" prop="twoLevelPosition" class="required">
                     <el-select v-model="form.twoLevelPosition" clearable placeholder="请选择" size="small">
                         <el-option
-                            v-for="item in typeList"
+                            v-for="item in twoLevelPositionList"
                             :key="item.key"
                             :label="item.name"
-                            :value="item.key">
+                            :value="item.name">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="显示顺序:" prop="order">
-                   <el-input v-model="form.order"></el-input>
+                   <!-- <el-input v-model="form.order"></el-input> -->
+                   <el-select v-model="form.order" clearable placeholder="请选择" size="small">
+                         <el-option
+                              v-for="(item) in orderList"
+                              :key="item.key"
+                              :label="item.val"
+                              :value="item.val">
+                          </el-option>
+                    </el-select>
                 </el-form-item>
-                <el-form-item label="科室:" prop="department">
-                   <el-input v-model="form.department"></el-input>
+                <el-form-item label="科室:" prop="department" class="required">
+                   <el-select v-model="form.department"   filterable  placeholder="请选择" size="small">
+                          <el-option
+                              v-for="(item) in departmentList"
+                              :key="item.id"
+                              :label="item.name"
+                              :value="item.name">
+                          </el-option>
+                      </el-select>
                 </el-form-item>
                 <el-form-item label="术语编码:" prop="termCode">
                    <el-input v-model="form.termCode"></el-input>
@@ -106,6 +196,7 @@
                 <el-button
                         type="primary"
                         @click="submitForm"
+                        class="confirmBtn"
                 >确 定</el-button>
             </div>
         </div>
@@ -118,77 +209,135 @@
   import api from '@api/icss.js';
 
   export default {
-    name: 'AddMedicinePrompt',
+    name: 'AddMedicalInfo',
     components: {
     },
     data() {
       return {
         isEdit:false,
-        conceptList: [
-            {
-              name:'概念1',
-              id:1,
-              key:1
-            },
-            {
-              name:'概念2',
-              id:2,
-              key:2
-            },
-            {
-              name:'概念3',
-              id:3,
-              key:3
-            },
-        ],
-        typeList:[
-            {
-              name:'类型1',
-              id:1,
-              key:1
-            },
-            {
-              name:'类型2',
-              id:2,
-              key:2
-            },
-            {
-              name:'类型3',
-              id:3,
-              key:3
-            },
+        conceptText: '',
+        conceptList: [],  //概念列表(标准书语列表,过滤掉已添加过的)
+        termClassText: '',
+        termClassList:[], //术语类组列表(未过滤)
+        termMiniClassText:'',
+        termMiniClassNameList:[], //术语小类名称列表(未过滤)
+        sexList: [
+          {
+              sex:'男',
+              val:'1',
+          },
+          {
+              sex:'女',
+              val:'2',
+          },
+          {
+              sex:'通用',
+              val:'3',
+          },
         ],
+        typeList:[],
+        primarySiteList: [],   //一级部位列表
+        twoLevelPositionList: [],  //二级部位列表
+        departmentList:[
+          {
+            id: 1,
+            name: '全科'
+          }
+        ], //科室列表
+        orderList:[
+          {
+            key: 0,
+            val: 0
+          },
+          {
+            key: 1,
+            val: 1
+          },
+          {
+            key: 2,
+            val: 2
+          },
+          {
+            key: 3,
+            val: 3
+          },
+          {
+            key: 4,
+            val: 4
+          },
+          {
+            key: 5,
+            val: 5
+          },
+          {
+            key: 6,
+            val: 6
+          },
+          {
+            key: 7,
+            val: 7
+          },
+          {
+            key: 8,
+            val: 8
+          },
+          {
+            key: 9,
+            val: 9
+          },
+          {
+            key: 10,
+            val: 10
+          }
+        ], //显示顺序列表
+        concept: '',
         form:{
-            concept: '',
+           concept:'',  //概念名称
+           name: '',    //术语名称
+           stdName: '', //术语标准名称
+           conceptType: '', //概念类型
+           termClass: '', //术语类组
+           termMiniClassName: '', //术语小类名称
+           sex: '',   //性别
+           minAge: '',  //最小年龄
+           maxAge: '',  //最大年龄
+           primarySite: '', //一级部位
+           twoLevelPosition: '',  //二级部位
+           order: '', //显示顺序
+           department: '',  //科室
+           termCode: '',  //术语编码
+           remark: '' //备注
         },
         rules: {
-            termName: [
-                { required: true, message: '请选择模板归属', trigger: 'change' }
-            ],
-            termStandardName: [
-                { required: true, message: '请选择模板归属', trigger: 'change' }
-            ],
-            termMiniClassName: [
-                { required: true, message: '请选择模板归属', trigger: 'change' }
-            ],
-            termClass: [
-                { required: true, message: '请选择模板归属', trigger: 'change' }
-            ],
-            sex: [
-                { required: true, message: '请选择模板归属', trigger: 'change' }
-            ],
-            age: [
-                { required: true, message: '请选择模板归属', trigger: 'change' }
-            ],
-            primarySite: [
-                { required: true, message: '请选择模板归属', trigger: 'change' }
-            ],
-            twoLevelPosition: [
-                { required: true, message: '请选择模板归属', trigger: 'change' }
-            ],
-            department: [
-                { required: true, message: '请选择模板归属', trigger: 'change' }
-            ],
+            // termStandardName: [
+            //     { required: true,  }
+            // ],
+
+            // termMiniClassName: [
+            //     { required: true,}
+            // ],
+            // termClass: [
+            //     { required: true, }
+            // ],
+            // sex: [
+            //     { required: true, }
+            // ],
+            
+            // primarySite: [
+            //     { required: true,}
+            // ],
+            // twoLevelPosition: [
+            //     { required: true, }
+            // ],
+            // department: [
+            //     { required: true,}
+            // ],
+            // minAge: [
+            //     { required: true, }
+            // ],
+            // maxAge: [
+            //     { required: true, }
+            // ]
         }
       }
     },
@@ -199,51 +348,174 @@
       const {isEdit,data} = this.$route.params;
       if(isEdit){
         this.isEdit = isEdit;
+        this.form.concept = data.conceptName
+        this.form.conceptType = data.conceptType
+        this.form.name = data.name
+        this.form.stdName = data.stdName
+        this.form.termClass = data.grp
+        this.form.termMiniClassName = data.cateName
+        this.form.sex = data.gender
+        this.form.minAge = data.minAge
+        this.form.maxAge = data.maxAge
+        this.form.primarySite = data.bodypart
+        this.form.twoLevelPosition = data.subBodypart
+        this.form.order = data.displayOrder
+        this.form.department = data.dept
+        this.form.termCode = data.code
+        this.form.remark = data.note
+
+      } else {
+        
       }
+      this.getPrimarySite()
     },
     methods: {
       back() { this.$router.go(-1) },
-     
-     
-      
-     
+      searchConcept() {
+        let param1 = {
+          "name": this.conceptText,
+          "isMedical": 1
+        }
+        this.getAllConcept(1, param1)
+        this.$refs['conceptList'].style.display = 'block'
+      },
+      searchTermClass() {
+        let param1 = {
+          "name": this.termClassText,
+        }
+        this.getAllConcept(2, param1)
+        this.$refs['termClassList'].style.display = 'block'
+      },
+      searchTermMiniClass() {
+        let param1 = {
+          "name": this.termMiniClassText,
+        }
+        this.getAllConcept(3, param1)
+        this.$refs['termMiniClassNameList'].style.display = 'block'
+      },
+      getAllConcept(type, param1) {   //获取所有概念
+        let param = {
+          "isConcept": 1,
+        }
+        param = Object.assign({}, param, param1)
+        api.getAllConcept(param).then((res) =>{
+          if(res.data.code == '0') {
+            if( type === 1 ) {
+              this.conceptList = res.data.data
+            } else if (type === 2) {
+              this.termClassList = res.data.data
+            } else if (type ===3) {
+              this.termMiniClassNameList = res.data.data
+            }
+            
+          } else {
+            this.warning(res.data.msg)
+          }
+        })
+      },
+      selectConcept(item) {
+        // const conceptItem = this.form.concept
+        const selectedConcept = item
+        this.form.concept = selectedConcept.name
+        this.form.name = selectedConcept.name
+        this.form.stdName = selectedConcept.name
+        this.form.conceptType = selectedConcept.type
+        this.$refs['conceptList'].style.display = 'none'
+        this.conceptText = ''
+      },
+      selectTermClass(item) {
+        this.form.termClass = item.name
+        this.$refs['termClassList'].style.display = 'none'
+        this.termClassText = ''
+      },
+      selectTermMiniClass(item) {
+        this.form.termMiniClassName = item.name
+        this.$refs['termMiniClassNameList'].style.display = 'none'
+        this.termMiniClassText = ''
+      },
       
+      getPrimarySite() { //获取一级部位
+        const param = {
+          "level": 1
+        }
+        this.getAllBodypart(param, 1)
+      },
+      getTwoLevelPosition() {
+        const param = {
+          "bodypart": this.form.primarySite,
+          "level": 2
+        }
+        this.getAllBodypart(param, 2)
+      },
+      getAllBodypart(param, type) {   //获取部位
+        api.getAllBodypart(param).then((res) =>{
+            if(res.data.code == '0') {
+              if (type === 1) {
+                  this.primarySiteList =  res.data.data
+              } else if(type === 2) {
+                  this.twoLevelPositionList =  res.data.data
+              }
+             
+            }
+         
+        })
+      },
+      getDeptInfo() {
+        api.getDeptInfo({}).then((res) => {
+          if(res.data.code == '0') {
+            this.departmentList = res.data.data.records
+          }
+        })
+      },
+      selectPrimarySite() {
+        this.form.twoLevelPosition = '';
+        this.getTwoLevelPosition();
+      },
       submitForm() {
         //验证外层表单
-        let goOn=true,it=null;
-        this.$refs.groups.validate((valid) =>{
-          if(!valid){
-            goOn = false;
-            return false;
-          }
-        });
-        //验证段落表单
-        for(let i=0;i<this.$refs.subForm.length;i++){
-          it=this.$refs.subForm[i];
-          it.$refs.form.validate((valid) =>{
-            if(!valid){
-              goOn = false;
-            }
-          });
-        };
+        // let goOn=true,it=null;
+        // this.$refs.groups.validate((valid) =>{
+        //   if(!valid){
+        //     goOn = false;
+        //     return false;
+        //   }
+        // });
 
-        if(!goOn){
-          return;
+        // if(!goOn){
+        //   return;
+        // }
+        const  { primarySite,termClass,termCode,concept,conceptType,department,order,sex,termMiniClassName, maxAge, minAge, name, remark, stdName, twoLevelPosition } = this.form
+        if ( !primarySite || !termClass || !concept || !conceptType|| !department || !sex || !termMiniClassName || !maxAge || !minAge || !name || !stdName || !twoLevelPosition ) {
+          this.warning('请填写必填项');
+          return
         }
         //通过必填验证,提交保存
         const param = {
-          name:this.form.selectedTerm.libId,
-          detailVOList:Object.assign(this.form.prags)
-        };
+          "bodypart": this.form.primarySite,
+          "grp": this.form.termClass,
+          "code": this.form.termCode,
+          "conceptName": this.form.concept,
+          "conceptType": this.form.conceptType,
+          "dept": this.form.department,
+          "displayOrder": this.form.order,
+          "gender": this.form.sex,
+          "cateName": this.form.termMiniClassName,
+          "maxAge":this.form.maxAge,
+          "minAge": this.form.minAge,
+          "name": this.form.name,
+          "note": this.form.remark,
+          "stdName": this.form.stdName,
+          "subBodypart": this.form.twoLevelPosition,
+        }
         console.log(param);
         this.showSaveDialog(param);
       },
       showSaveDialog(param) {
-        this.showConfirmDialog('是否保存该静态知识?', () => {
-          api.saveTermPrompts(param).then((res) => {
+        this.showConfirmDialog('是否保存该医学术语属性?', () => {
+          api.addMedicalInfo(param).then((res) => {
             if (res.data.code === '0') {
               this.warning(res.data.msg || '保存成功', 'success');
-              this.$router.push("/admin/LT-YXSYKWH-YXSYJTZSWH");
+              this.$router.push("/admin/LT-YXSYKWH-SYYXSXWH");
             } else {
               this.warning(res.data.msg)
             }
@@ -273,7 +545,84 @@
 <style lang="less">
     @import "../../less/common.less";
     .MedicalInfoWrapper {
-
+      .required {
+        .el-form-item__label::before {
+          color: red;
+          content:'*'
+        }
+      }
+        
+        .conceptSearch {
+          height: 30px;
+          margin: 4px 0;
+          position: relative;
+        }
+        .searchText {
+          padding: 0 10px;
+          width: 180px;
+          height: 30px;
+          line-height: 30px;
+          border: 1px solid #dcdfe6;
+          float: left;
+          border-radius: 4px 0 0 4px;
+        }
+        .searchName {
+          display: block;
+          width: 40px;
+          height: 30px;
+          border: 1px solid #dcdfe6;
+          border-left: none;
+          border-radius: 0 4px 4px 0;
+          font-size: 14px;
+          line-height: 30px;
+          text-align: center;
+          float: left;
+          
+        }
+        .conceptList {
+          position: absolute;
+          border: 1px solid #dcdfe6;
+          top: 30px;
+          width: 200px;
+          max-height: 160px;
+          z-index: 10;
+          overflow: auto;
+          background: #fff
+        }
+        .conceptItem {
+          padding: 0 10px;
+          height: 30px;;
+          line-height: 30px;
+          overflow: hidden;
+        }
+        .conceptItem:hover {
+          border: 1px solid #22ccc8;
+        }
+        .termMiniClassSearch {
+          z-index: 8
+        }
+        .termClassSearch {
+          z-index: 6
+        }
+        .info-container {
+            .fix-inp {
+              
+              .el-form-item__error {
+                width: 200px;
+              }
+            }
+        }
+        .groupTitle {
+            width: calc(100% - 50px);
+            height: 40px;
+            background: #fff;
+            padding: 0 20px 0 30px;
+            margin-bottom: 20px;
+            line-height: 40px;
+            position: relative;
+            z-index: 5;
+            
+        }
         .fix-inp{
             width: 330px;
         }
@@ -287,6 +636,7 @@
         .fix-inp .el-col-8{
             text-align: center;
         }
+        
         .el-textarea__inner {
             width: 400px;
         }
@@ -310,6 +660,24 @@
             margin-bottom: 25px;
 
         }
+        .btn {
+          position: relative;
+          height: 50px;
+        }
+        .confirmBtn {
+          position: absolute;
+          right: 40px;
+        }
+         // 处理input type = number的上下箭头
+        input::-webkit-outer-spin-button,
+        input::-webkit-inner-spin-button {
+          -webkit-appearance: none;
+          text-align: center;
+        }
+        input[type="number"]{
+          -moz-appearance: textfield;
+          text-align: center;
+        }
 
     }
     

+ 88 - 60
src/components/icss/AddMedicinePrompt.vue

@@ -9,30 +9,43 @@
                      :model="form"
                      label-width="130px"
                      ref="groups">
-                <el-form-item v-if="!isEdit" label="选择术语标签:" prop="selectedTerm">
+                <el-form-item v-if="!isEdit" label="选择术语:" prop="selectedTerm">
                     <el-select v-model="form.selectedTerm"
                                filterable
                                remote
                                clearable
-                               value-key="libId"
+                               value-key="id"
                                ref="termName"
                                placeholder="搜索术语"
                                :remote-method="searchTerms">
-                        <el-option v-for="term in terms" :key="term.libId" :label="term.name" :value="term" ></el-option>
+                        <el-option v-for="term in terms" :key="term.id" :label="term.name+'-('+term.type+')'" :value="term" ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="已选择术语标签:">
                     {{form.selectedTermName}}
                 </el-form-item>
-                <el-form-item label="添加静态知识">
+                <el-form-item label="术语类型:">
+                    {{form.selectedTermType}}
+                    <!--<el-select  filterable
+                                remote
+                                clearable
+                                v-model="form.termType"
+                                placeholder="搜索术语类型">
+                        <el-option v-for="it in termTypes" :label="it.name" :value="it.name" :key="it.id"></el-option>
+                    </el-select>-->
                 </el-form-item>
-                <InfoParagraph v-for="(f,i) in form.prags"
-                               :data="f"
-                               :index="i"
+                <p class="line"></p>
+                <el-form-item label="添加静态知识" style="font-weight: bold">
+                </el-form-item>
+                <el-form-item label="静态知识来源:" prop="source">
+                    <el-input v-if="!isEdit" v-model="form.source" placeholder="输入静态知识来源"></el-input>
+                    {{isEdit?form.source:''}}
+                </el-form-item>
+                <InfoParagraph :data="form.prags[0]"
+                               :index="0"
+                               :len="1"
                                :isEdit = "isEdit"
-                               @change="getPgValues"
-                               @add="addParagraph"
-                               @del="delParagraph" ref="subForm"></InfoParagraph>
+                               ref="subForm"></InfoParagraph>
             </el-form>
             <div class="btn">
                 <el-button
@@ -48,7 +61,7 @@
    *
    */
   import api from '@api/icss.js';
-  import InfoParagraph from './InfoParagraph';
+  import InfoParagraph from './MedicineInfoPg';
 
   export default {
     name: 'AddMedicinePrompt',
@@ -58,14 +71,20 @@
     data() {
       return {
         isEdit:false,
+        termTypes:[],
         terms:[],              //术语列表
         editData:{
           selectedTerm:'',
           prags:[]
         },
         form:{
+          conceptId:'',             //术语id
+          isTip:0,                 //是否要覆盖,0不覆盖,1覆盖
           selectedTerm:'',            //术语标签
+          termType:'',
+          source:'',
           selectedTermName:'',
+          selectedTermType:'',
           prags:[{              //单个段落相关
             title:'',
             content:'',
@@ -75,6 +94,9 @@
             text:''}]
         },
         rules: {
+          source: [
+            { required: true, message: '请输入静态知识来源', trigger: 'change' }
+          ],
           selectedTerm: [
             { required: true, message: '请选择术语标签', trigger: 'change' }
           ]
@@ -84,26 +106,56 @@
     watch:{
       'form.selectedTerm':function(newVal){
         const name = newVal.name;
-        this.editData.selectedTermName = name;
+        //this.editData.selectedTermName = name;
+        this.form.selectedTermName = name;
+        this.form.selectedTermType = newVal.type;
+        this.form.conceptId = newVal.conceptId;
       }
     },
     created:function(){
       const {isEdit,data} = this.$route.params;
+      //this.getTermTypes();
       if(isEdit){
         this.isEdit = isEdit;
-        this.form.selectedTermName = data.name;
+        /*api.getTremList({term:data.name,type:data.type}).then((res) => {
+          if (res.data.code == '0') {
+            const data = res.data.data;
+            this.form.prags=data.information&&data.information.map((it)=>{
+              return {title:it.title,position:this.mapStringToNum(it.position),content:it.content,isReason:it.isReason};
+            });
+            console.log(data)
+          }
+        }).catch((error) => {
+          console.log(error);
+        });*/
+        this.form.selectedTermName = data.conceptName;
+        this.form.selectedTermType = data.conceptType;
+        this.form.source = data.source;
+        this.form.conceptId = data.conceptId;
         this.form.prags[0].content = data.content;
+        this.form.prags[0].isReason = data.isReason;
         this.form.prags[0].position=this.mapStringToNum(data.position);
         this.form.prags[0].title = data.title;
       }
     },
     methods: {
       back() { this.$router.go(-1) },
+      async getTermTypes(){
+        let types = localStorage.getItem('termTypes');
+        if(!types){
+          types = await api.getAllType();
+          if(types.data.code=='0'){
+            this.termTypes = types.data.data.records;
+          }
+        }else{
+          this.termTypes = JSON.parse(types).records;
+        }
+      },
       searchTerms(query){
         //搜索术语列表
-        api.getConceptInfo({term:query,type:''}).then((res) =>{
+        api.knowledgeName({term:query,type:''}).then((res) =>{
           if(res.data.code === '0') {
-            this.terms = res.data.data;
+            this.terms = res.data.data.records;
           }else{
             this.warning("数据获取失败");
           }
@@ -114,39 +166,6 @@
           return +it;
         })
       },
-      parseData(info){
-        let detail = [];
-        info.details.forEach((it)=>{
-          detail.push(Object.assign({},it,{position:this.mapStringToNum(it.position)}));
-        });
-        return {
-          name:info.name,
-          tagFor:info.questionList[0].type+'',
-          selectedTags:info.questionList,
-          prags:detail
-        };
-      },
-      addParagraph(){
-        this.form.prags.push({title:'',
-          content:'',
-          isReason:0,
-          orderNo:0,
-          position:[],
-          text:''});
-      },
-      delParagraph(i){
-        if(this.form.prags.length==1){
-          this.warning('只剩一个段落,不能再删啦!');
-          return;
-        }
-        this.showConfirmDialog('确定要删除该段落?', () => {
-          this.form.prags.splice(i,1);
-        });
-      },
-      getPgValues(i,data){
-        this.form.prags[i] = data;
-        //console.log(data,this.form.prags);
-      },
       submitForm() {
         //验证外层表单
         let goOn=true,it=null;
@@ -157,32 +176,36 @@
           }
         });
         //验证段落表单
-        for(let i=0;i<this.$refs.subForm.length;i++){
-          it=this.$refs.subForm[i];
+        //for(let i=0;i<this.$refs.subForm.length;i++){
+          it=this.$refs.subForm;
           it.$refs.form.validate((valid) =>{
             if(!valid){
               goOn = false;
             }
           });
-        };
+        //};
 
         if(!goOn){
           return;
         }
         //通过必填验证,提交保存
-        const param = {
-          name:this.form.selectedTerm.libId,
-          detailVOList:Object.assign(this.form.prags)
-        };
-        console.log(param);
-        this.showSaveDialog(param);
+        const item=this.form.prags[0];
+        const param = Object.assign({},item,{
+                                                position:typeof item.position=='string'?item.position:item.position.join(","),
+                                                source:this.form.source,
+                                                conceptId:this.form.conceptId,isTip:1,
+                                              });
+        this.showSaveDialog(param,'是否保存该静态知识?');
       },
-      showSaveDialog(param) {
-        this.showConfirmDialog('是否保存该静态知识?', () => {
+      showSaveDialog(param,msg) {
+        this.showConfirmDialog(msg, () => {
           api.saveTermPrompts(param).then((res) => {
             if (res.data.code === '0') {
               this.warning(res.data.msg || '保存成功', 'success');
               this.$router.push("/admin/LT-YXSYKWH-YXSYJTZSWH");
+            } else if(res.data.code === '00000002'){
+              //已存在,选择是否覆盖
+              this.showSaveDialog(Object.assign({},param,{isTip:0}),res.data.msg);
             } else {
               this.warning(res.data.msg)
             }
@@ -192,8 +215,10 @@
         });
       },
       showConfirmDialog(msg, resolve) {
-        this.$alert(msg, '提示', {
+        this.$confirm(msg, '提示', {
           confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          cancelButtonClass:'cancel',
           type: 'warning'
         }).then(() => {
           resolve();
@@ -225,6 +250,9 @@
         margin-bottom: 20px;
     }
     }
+    .cancel span{
+        color: #22ccc8;
+    }
     .line{
         border-top:1px #dcdfe6 solid;
         margin-bottom: 25px;

+ 16 - 5
src/components/icss/AddPhysicalExamTemp.vue

@@ -149,6 +149,7 @@
                 "tagName": this.searchVal,
                 "type": 4,
                 "notIds": notIds,
+                "notTagType": [8],
             }
             api.searchTagList(param).then((res) => {
                 if (res.data.code === '0') {
@@ -201,7 +202,7 @@
             const tempItem = this.rightTagsList[this.selectRightTagIndex]
             this.rightTagsList.splice(this.selectRightTagIndex, 1)
             this.rightTagsList.splice(this.selectRightTagIndex-1, 0,tempItem)
-            this.selectRightTagIndex = -1
+            this.selectRightTagIndex -= 1
         },
         toDown(){
              if(this.selectRightTagIndex === this.rightTagsList.length-1 || this.selectRightTagIndex === -1) {
@@ -210,7 +211,7 @@
             const tempItem = this.rightTagsList[this.selectRightTagIndex]
             this.rightTagsList.splice(this.selectRightTagIndex, 1)
             this.rightTagsList.splice(this.selectRightTagIndex+1, 0,tempItem)
-            this.selectRightTagIndex = -1
+            this.selectRightTagIndex += 1
 
         },
 
@@ -229,7 +230,12 @@
             return this.isHasTag(item, this.selectRightTagsList)
         },
         submitForm(formName) {
-           
+            if( this.isDetail) {
+                this.$router.push({
+                        path:'/admin/LT-YXSJWH-CTMBWH'
+                })
+                return
+            }
             this.$refs[formName].validate((valid) => {
                 if (valid) {
                     return
@@ -245,21 +251,26 @@
         },
         showDelDialog() {
             let dvDetailVOList = []
+            const deptName = this.departList.filter(item => item.id == this.form.department)[0].name
             for (let i =0; i < this.rightTagsList.length; i++) {
-                dvDetailVOList.push({orderNo: i+1,vitalId:this.rightTagsList[i].id })
+                dvDetailVOList.push({orderNo: i+1,vitalId:this.rightTagsList[i].id , remark: `${deptName}-${this.rightTagsList[i].tagName}`})
             }
             const param ={
                 "deptId": this.form.department,
                 "dvDetailVOList": dvDetailVOList
    
             }
+            if(dvDetailVOList.length === 0) {
+                this.warning('查体模板不能为空');
+                return
+            }
             this.showConfirmDialog('是否保存该模板?', () => {
                 api.savePhysicalExamTemp(param).then((res) => {
                 if (res.data.code  === '0') {
                     this.warning(res.data.msg || '保存成功', 'success','1000')
                     setTimeout(() => {
                     this.$router.push({
-                        path:'/admin/LT-YXSJWH-CTBQWH'
+                        path:'/admin/LT-YXSJWH-CTMBWH'
                     })
                     }, 1000);
                 } else {

+ 19 - 9
src/components/icss/AddPromptInfo.vue

@@ -15,8 +15,8 @@
                 <InfoParagraph v-for="(f,i) in form.prags"
                                :data="f"
                                :index="i"
+                               :len="len"
                                :isEdit = "isEdit"
-                               @change="getPgValues"
                                @add="addParagraph"
                                @del="delParagraph" ref="subForm"></InfoParagraph>
                 <p class="line"></p>
@@ -28,7 +28,7 @@
                     </el-form-item>
                     <TagPool :pool="tagPool"
                              :type="form.tagFor"
-                             :selected="editData.selectedTags"
+                             :selected="form.selectedTags"
                              @changeActionData="changeActionData"></TagPool>
                 </el-form-item>
                 </el-form>
@@ -68,8 +68,10 @@
       return {
         isEdit:false,
         tagPool:[],                 //标签池数据
+        len:0,
         Adscriptions:[],            //归属列表
         editData:{
+          id:'',
           tagFor:'',
           selectedTags:[],
           prags:[]
@@ -106,6 +108,7 @@
           if(res.data.code === '0') {
             this.form = this.parseData(res.data.data);
             this.editData = Object.assign({},this.form);
+            this.len=res.data.data.details&&res.data.data.details.length;
           }else{
             this.warning("数据获取失败");
           }
@@ -125,6 +128,7 @@
           detail.push(Object.assign({},it,{position:this.mapStringToNum(it.position)}));
         });
         return {
+          id:info.id,
           name:info.name,
           tagFor:info.questionList[0].type+'',
           selectedTags:info.questionList,
@@ -148,10 +152,10 @@
             this.form.prags.splice(i,1);
         });
       },
-      getPgValues(i,data){
+      /*getPgValues(i,data){
         this.form.prags[i] = data;
         //console.log(data,this.form.prags);
-      },
+      },*/
       getDropList() {
         return api.getDropList().then((res) =>{
           if(res.data.code === '0') {
@@ -183,12 +187,18 @@
         }
         //通过必填验证,提交保存
        const param = {
+          id:this.editData.id||undefined,
           name:this.form.name,
-          detailVOList:Object.assign(this.form.prags),
-          mapVOList:Object.assign(this.form.selectedTags)
+          detailVOList:this.parsePosition(this.form.prags),
+          mapVOList:this.parseTagsForSubmit(this.form.selectedTags)
         };
-        //console.log(param);
-         this.showSaveDialog(param);
+        this.showSaveDialog(param);
+      },
+      parsePosition(data){
+        const arr = data.map((it)=>{
+          return Object.assign({},it,{position:typeof it.position=='string'?it.position:it.position.join(",")});
+        });
+        return arr;
       },
       parseTagsForSubmit(data){
         return data.map((it)=>{
@@ -196,7 +206,7 @@
         });
       },
       changeActionData(selectedTags){
-        this.form.selectedTags = this.parseTagsForSubmit(selectedTags);
+        this.form.selectedTags = selectedTags;
         //console.log(selectedTags)
       },
       showSaveDialog(param) {

+ 1 - 1
src/components/icss/BloodPressTagGroup.vue

@@ -131,7 +131,7 @@ export default {
                     this.rightTagsList2 = [];
                     this.selectRightTagsList = [];
                     this.searchVal = '';
-                    //  this.searchTagList();
+                     this.searchTagList();
                 }
             }
         },

+ 1 - 1
src/components/icss/CommonSymptom.vue

@@ -181,7 +181,7 @@
         }).catch(() => {});
       },
       showDelDialog(row){
-        this.showConfirmDialog('是否删除该科室症状?',()=>{
+        this.showConfirmDialog('是否删除该科室常见症状?',()=>{
           const param = {
             "deptId": row.id,
             "type": row.type

+ 165 - 19
src/components/icss/CommonTemplate.vue

@@ -37,8 +37,25 @@
         ></span></p>
     </div>
     <div class="bottomPartRight bottomPartRightTemplate">
-      <p class="poolTitle">模板内容:</p>
+      <p class="poolTitle poolTitleTmp">模板内容:
+        <span style="color:#22ccc8;fontSize:12px" v-if="type == 1">特殊标记1-只可放入主诉模块中,放入其他模块数据会显示异常;</span>
+        <span style="color:#22ccc8;fontSize:12px" v-if="type == 3 || type == 2">特殊标记4-只可放入现病史模块中,放入其他模块数据会显示异常;</span>
+        <span style="color:#22ccc8;fontSize:12px" v-if="type == 5">特殊标记1-只可放入主诉模块中,放入其他模块数据会显示异常;特殊标记4-只可放入现病史模块中,放入其他模块数据会显示异常;</span>
+      </p>
+        <div v-if="type == 5">
+          <span style="marginLeft:10px;">
+            <el-button v-if="flagLisFst == 1" type="primary" class="flagStyle" size="mini" @click="addFlg(1)" :disabled="flagLisSec == 4">1、标示主诉中添加症状展示位置</el-button>
+            <el-button v-else class="flagStyle" size="mini" @click="addFlg(1)" :disabled="flagLisSec == 4">1、标示主诉中添加症状展示位置</el-button>
+          </span>
+          <span style="marginLeft:10px;">
+            <el-button style="marginTop:3px;" v-if="flagLisSec == 4" type="primary" class="flagStyle" size="mini" @click="addFlg(4)" :disabled="flagLisFst == 1">4、标示在主诉中症状引用到现病史中展示位置
+  和添加症状位置</el-button>
+            <el-button style="marginTop:3px;" v-else class="flagStyle" size="mini" @click="addFlg(4)" :disabled="flagLisFst == 1">4、标示在主诉中症状引用到现病史中展示位置
+  和添加症状位置</el-button>
+          </span>
+        </div>
       <div class="arrowWrap" style="float:right;marginRight:10px" v-if="type != 1 && type != 2 && type != 3">
+        <el-button size="mini" @click="addDomTemplate(1)">插入输入栏</el-button>
         <i class="el-icon-arrow-left arrowWrapPub" @click="moveTag(0)"></i>
         <i class="el-icon-arrow-right arrowWrapPub" @click="moveTag(1)"></i>
       </div>
@@ -63,15 +80,25 @@
                   :key="item.id"
                 ></el-option>
               </el-select>
-              <el-button size="mini" @click="addDomTemplate(0,'submitForm')">添加</el-button>
-              <el-button size="mini" @click="delSubTemplate">删除子模板</el-button>
-              <el-button size="mini" @click="addDomTemplate(1)">插入输入栏</el-button>
+              <el-button size="mini" class="normal" @click="addDomTemplate(0,'submitForm')">添加</el-button>
+              <el-button size="mini" class="normal" @click="delSubTemplate">删除子模板</el-button>
+              <el-button size="mini" class="normal" @click="addDomTemplate(1)">插入输入栏</el-button>
+              <span v-if="type == 1" style="marginLeft:10px;">
+                <el-button v-if="flagLisFst == 1" type="primary" class="flagStyle" size="mini" @click="addFlg(1)">1、标示主诉中添加症状展示位置</el-button>
+                <el-button v-else class="flagStyle" size="mini" @click="addFlg(1)">1、标示主诉中添加症状展示位置</el-button>
+              </span>
+              <span v-if="type == 2 || type == 3" style="marginLeft:10px;">
+                <el-button v-if="flagLisSec == 4" type="primary" class="flagStyle" size="mini" @click="addFlg(4)">4、标示在主诉中症状引用到现病史中展示位置
+和添加症状位置</el-button>
+                <el-button v-else class="flagStyle" size="mini" @click="addFlg(4)">4、标示在主诉中症状引用到现病史中展示位置
+和添加症状位置</el-button>
+              </span>
+              <div class="arrowWrap">
+                <i class="el-icon-arrow-left arrowWrapPub" @click="moveTag(0)"></i>
+                <i class="el-icon-arrow-right arrowWrapPub" @click="moveTag(1)"></i>
+              </div>
             </el-form-item>
           </el-form>
-        <div class="arrowWrap">
-          <i class="el-icon-arrow-left arrowWrapPub" @click="moveTag(0)"></i>
-          <i class="el-icon-arrow-right arrowWrapPub" @click="moveTag(1)"></i>
-        </div>
       </div>
       <ul class="tagList operationPool templateTagLists">
         <li
@@ -88,17 +115,20 @@
                 @change="updataData"
               >
               </el-input>
+              <!-- <i class="tagFlag">{{item.flag?(item.flag == 4?2:1):''}}</i> -->
           </div>
           <p
             v-if="item.type === 'sub'"
             class="tagName  ellipsis"
             :title="'[ '+item.tagName+' ]'"
-          >{{item.tagName}}</p>
+          >{{item.tagName}} 
+            <!-- <i class="tagFlag">{{item.flag?(item.flag == 4?2:1):''}}</i> -->
+            </p>
           <p
             v-if="item.type !== 'input' && item.type !== 'sub'"
             class="tagName  ellipsis"
             :title="'[ '+item.tagName+' ]'"
-          >{{item.tagName}} </p>
+          >{{item.tagName}} <i class="tagFlag" v-if="item.flag">{{item.flag}}</i></p>
         </li>
       </ul>
     </div>
@@ -118,6 +148,10 @@ export default {
       default: '',
       type: String
     },
+    sign: {
+      default: '',
+      type: String
+    },
     options: {
       default: () => {},
       type: Object
@@ -142,6 +176,8 @@ export default {
       styles: {
         background: '#eae7e7'
       },
+      flagLisFst:-1,
+      flagLisSec:-1
     }
   },
   destroyed: function () {
@@ -165,10 +201,14 @@ export default {
               reviewList[m].type = 'input'
               reviewList[m].text = reviewList[m].tagName
             }else{    //这个是标签
+              if(reviewList[m].flag == 1 || reviewList[m].flag == 4){
+                
+              }
               reviewList[m].id = reviewList[m].questionId
             }
           }
           this.rightTagsList = reviewList
+          this.getFlagList()
         }
         this.$emit('changeActionData', this.rightTagsList, false);
         this.getSubTemplate()
@@ -180,7 +220,6 @@ export default {
   },
   watch: {
     type(newVal, preVal) {
-      this.searchTagList()       //重新获取标签池数据
       if(newVal != preVal){
         this.form = {region: ''}  
         this.subTmpList = []     //子模板的id用于去重
@@ -190,8 +229,26 @@ export default {
         this.selectRightTagsList = []
         this.selectRightTagsListIndex = []
         this.searchVal = ''
+        this.flagLisFst = -1
+        this.flagLisSec = -1
         this.getSubTemplate()      //重新获取子模板
       }
+      this.searchTagList()       //重新获取标签池数据
+    },
+    sign(newVal, preVal) {
+      if(newVal != preVal){
+        this.form = {region: ''}  
+        this.subTmpList = []     //子模板的id用于去重
+        this.leftTagsList = []
+        this.selectLeftTagsList = []
+        this.rightTagsList = []
+        this.selectRightTagsList = []
+        this.selectRightTagsListIndex = []
+        this.searchVal = ''
+        this.flagLisFst = -1
+        this.flagLisSec = -1
+      }
+      this.searchTagList()       //重新获取标签池数据
     },
     searchVal(newVal, preVal) {
       if (newVal.trim() == '') {
@@ -205,6 +262,49 @@ export default {
     updataData(){
       this.$emit('changeActionData', this.rightTagsList, false);
     },
+    getFlagList(){
+      let lis =  this.rightTagsList;
+      for(let i = 0;i < lis.length;i++){
+        let tmpLi = lis[i];
+        if(tmpLi.flag == 1){
+          this.flagLisFst = 1
+        }else if(tmpLi.flag == 4){
+          this.flagLisSec = 4
+        }
+      }
+    },
+    addFlg(idx){//添加标记,已经有标记了先去掉标记,再点击才能加上,没有标记的加上标记
+      let selectTagFlg = this.selectRightTagsListIndex;
+      let tmpSelectRightTagsList = this.selectRightTagsList;
+      let tmpLis = this.rightTagsList;
+      let tmpObj = tmpLis[selectTagFlg[0]],m = 0;
+      if(tmpSelectRightTagsList && tmpSelectRightTagsList.length>0 && (tmpSelectRightTagsList[0].type == 'input' || tmpSelectRightTagsList[0].type == 'sub')){
+        return;
+      }
+      for(let i = 0;i < tmpLis.length;i++){//循环右侧所有标签,点击的这个有标记,去掉标记,点击的没有标记,去掉其他标记,标记当前项
+        let tmpLi = tmpLis[i];
+        if(tmpLi.flag == idx){   //有标记
+          if(tmpSelectRightTagsList.length == 0){//没选中
+            return
+          }else if(tmpSelectRightTagsList.length > 0){//有选中
+            if(tmpSelectRightTagsList[0].flag == idx){//选中的有标记
+              tmpLi.flag = null
+              idx == 1?(this.flagLisFst = -1):(idx == 4?this.flagLisSec = -1:null)
+            }else{//选中的没标记
+              return
+            }
+          }
+        }else{//没有标记,判断是否有选中,选中就加上标记,没有不做处理
+          ++m
+          if((m == tmpLis.length)&& tmpSelectRightTagsList && tmpSelectRightTagsList.length>0){
+            tmpObj.flag = idx
+            idx == 1?(this.flagLisFst = 1):(idx == 4?this.flagLisSec = 4:null)
+          }
+        }
+      }
+      this.rightTagsList = [...tmpLis]
+      this.getFlagList()
+    },
     addDomTemplate(sign,dom){
       let tmpArr1 = this.rightTagsList.slice(0);
       let tmpArr2 = this.selectRightTagsListIndex.slice(0);
@@ -212,6 +312,13 @@ export default {
       let tmpArr4 = this.Adscriptions.filter(item => item.id == tmpRegion);
       let tmpTag = Object.assign({},this.addTag);     //深度复制obj
       if(sign == 0){         //添加子模板
+        if(tmpArr3.length > 0){
+          this.$message({
+            message:'模板中只能添加一个子模板',
+            type:'warning'
+          })
+          return
+        }
         if(tmpArr4.length == 0){
           this.$message({
             message:'请选择子模板',
@@ -220,6 +327,7 @@ export default {
           return false;
         }
         tmpTag.type = 'sub'
+        tmpTag.flag = '3'
         tmpArr3.push(tmpRegion)
         tmpTag.tagName = tmpArr4[0].name
         tmpTag.id = tmpArr4[0].id + 'sub'
@@ -237,6 +345,7 @@ export default {
       }
       this.rightTagsList = tmpArr1;
       this.$emit('changeActionData', this.rightTagsList, false);
+      this.getFlagList()
     },
     moveTag(dir){
       let tmpArr1 = this.rightTagsList.slice(0);
@@ -275,18 +384,20 @@ export default {
         this.selectRightTagsListIndex = tmpArr2
         this.rightTagsList = tmpArr
       }
+      this.getFlagList()
       this.$emit('changeActionData', this.rightTagsList, false);
     },
     delSubTemplate(){   //删除子模板
       if (this.selectRightTagsList.length>0 && this.selectRightTagsList[0].type === 'sub') {    //删除子模板,输入框或者标签就不变
-        this.rightTagsList = this.rightTagsList.filter(item => item.id !== this.selectRightTagsList[0].id)
-        this.subTmpList = this.subTmpList.filter(item => item.id !== this.selectRightTagsList[0].id)  //选中的子模板id去掉
+        this.rightTagsList = this.rightTagsList.filter(item => item.id != this.selectRightTagsList[0].id)
+        this.subTmpList = this.subTmpList.filter(item => item != parseInt(this.selectRightTagsList[0].id))  //选中的子模板id去掉
       }
       this.selectLeftTagsList = []
       this.selectRightTagsList = []
       this.selectRightTagsListIndex = []
       this.$emit('changeActionData', this.rightTagsList, false);
       this.getSubTemplate()
+      this.getFlagList()
     },
     selectLeftTag(tag, index, e) {
       const hasTag = this.isHasTag(tag, this.selectLeftTagsList)
@@ -336,6 +447,7 @@ export default {
       this.selectLeftTagsList = []
       this.selectRightTagsList = []
       this.selectRightTagsListIndex = []
+      this.getFlagList()
     },
     toRightList() {
       this.rightTagsList.push(...this.selectLeftTagsList);
@@ -346,10 +458,12 @@ export default {
       this.selectRightTagsList = []
       this.selectRightTagsListIndex = []
       this.$emit('changeActionData', this.rightTagsList, false);
+      this.getFlagList()
     },
     searchTagList() {
       let notIds = []
       let tmpArr = this.rightTagsList.slice();
+      console.log(tmpArr)
       for (let i = 0; i < tmpArr.length; i++) {
         if(tmpArr[i].type != 'sub' && tmpArr[i].type != 'input'){
           notIds.push(tmpArr[i].id)
@@ -395,6 +509,9 @@ export default {
     margin-bottom: 20px;
     display: inline-block;
   }
+  .poolTitleTmp {
+    margin-bottom: 8px;
+  }
   .inputBox {
     width: 100px;
   }
@@ -422,6 +539,18 @@ export default {
   .tagName {
     line-height: 30px;
   }
+  .tagFlag {
+    position: absolute;
+    right: -3px;
+    top: 0;
+    width: 16px;
+    height: 16px;
+    border-radius: 8px;
+    line-height: 16px;
+    text-align: center;
+    // background-color: #ccc;
+    color: red;
+  }
   .tagName:before {
     content: "[";
   }
@@ -463,15 +592,21 @@ export default {
           background: #fff;
           line-height: 23px;
           border-radius: 3px;
-          margin-left: 10px;
+          margin:0 7px 10px 5px;
         }
       }
     .formWrap {
       position: relative;
       height: 30px;
       .subTemplate {
-        width: 470px;
+        width: 100%;
         float: left;
+        .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item{
+          margin-bottom: 0;
+        }
+        .el-button+.el-button{
+          margin: 0 0 10px 10px;
+        }
       }
     }
   }
@@ -492,6 +627,7 @@ export default {
     text-align: center;
     float: left;
     height: 40px;
+    position: relative;
     p {
       padding: 5px 0;
     }
@@ -517,23 +653,33 @@ export default {
     .el-button--mini, .el-button--mini.is-round {
       padding: 5px 8px 4px;
     }
-    .el-button:hover {
+    .normal.el-button:hover {
         color: @adminBase;
         border-color: @adminBase;
         outline: 0;
         opacity: 1;
         background-color: #fff;
     }
-    .el-button:active {
-        color: @adminBase;
+    .normal.el-button:active {
+      color: @adminBase;
         border-color: @adminBase;
         outline: 0;
     }
-    .el-button:focus {
+    .normal.el-button:focus {
       background-color: #fff;
       color: @adminBase;
       opacity: 1;
     }
+    .flagStyle.el-button:hover {
+        outline: 0;
+        opacity: 1;
+    }
+    .flagStyle.el-button:active {
+        outline: 0;
+    }
+    .flagStyle.el-button:focus {
+      opacity: 1;
+    }
   }
 }
   

+ 9 - 5
src/components/icss/IndeptLabel.vue

@@ -2,11 +2,11 @@
     <div>
         <crumbs title="独立标签维护">
             <el-form :inline="true" class="demo-form-inline">
-                <!--<el-form-item label="标签类型:">
-                    <el-select size="mini" v-model="filter.tagType[0]" placeholder="标签类型" clearable>
+                <el-form-item label="标签类型:">
+                    <el-select size="mini" v-model="filter.controlType[0]" placeholder="标签类型" clearable>
                         <el-option v-for="item in tagTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
                     </el-select>
-                </el-form-item>-->
+                </el-form-item>
                 <el-form-item label="标签归属:">
                     <el-select size="mini" v-model="filter.tagAdscription" @change="getValue"  placeholder="标签归属" clearable>
                         <el-option v-if="item.val!=6&&item.val!=7&&item.val!=8&&item.val!=9" v-for="item in Adscriptions" :label="item.name" :value="item.val" :key="item.id" ></el-option>
@@ -102,8 +102,10 @@
         list: [],
         tagTypes: [],
         Adscriptions: [],
+        tagTypesList:[],
         filter: {
           tagType: [], //标签类型
+          controlType: [],
           tagAdscription: '', //标签归属
           tagSysName: '', //标签系统名称
         },
@@ -124,10 +126,11 @@
       },
       getDropList() {
         return api.getDropList().then((res) =>{
-          console.log('dropList', res)
           if(res.data.code === '0') {
             this.Adscriptions = res.data.data[1];
             this.tagTypes =  res.data.data[6];
+            this.tagTypes =  this.tagTypes.filter(item => item.val != 0)  //去掉名称为默认值的填写单类型
+      
           }
 
         })
@@ -190,7 +193,8 @@
           current: this.currentPage,
           size: this.pageSize,
           type: this.filter.tagAdscription,
-          tagName: this.filter.tagSysName
+          tagName: this.filter.tagSysName,
+          controlTypeList: this.filter.controlType
         };
         return param;
       },

+ 57 - 37
src/components/icss/InfoParagraph.vue

@@ -1,55 +1,71 @@
 <template>
     <el-form :rules="rules" :model="data" ref="form" class="sub-form">
             <p class="line"></p>
-            <el-input v-model="data.orderNo" :value="index" type="hidden"></el-input>
-            <el-form-item label="是否属于诊断:" prop="isReason" @change="emitVal">
-                <el-select v-model="data.isReason" placeholder="请选择" :disabled="isEdit">
+            <!--<el-input v-model="form.orderNo" :value="index" type="hidden"></el-input>-->
+            <el-form-item label="是否属于诊断:" prop="isReason">
+                <el-select v-model="data.isReason" placeholder="请选择" :disabled="isEdit&&index<len">
                     <el-option label="否" :value="0"></el-option>
                     <el-option label="是" :value="1"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="显示位置:" prop="position" label-width="130px">
-                <el-checkbox-group v-model="data.position" @change="emitVal" :disabled="isEdit">
+                <el-checkbox-group v-model="data.position" :disabled="isEdit&&index<len">
                     <el-checkbox v-for="it in positions" :key="it.key" :label="it.key">{{it.name}}</el-checkbox>
                 </el-checkbox-group>
             </el-form-item>
             <el-form-item label="标题" prop="title" label-width="130px">
-                <el-input v-model="data.title" @change="emitVal"></el-input>
+                <el-input v-model="data.title" maxlength="120"></el-input>
             </el-form-item>
             <el-form-item label="内容" prop="content" label-width="130px">
-                <InfoUeditor v-model="data.content" :config="config"></InfoUeditor>
+                <quillEditor v-model="data.content" :options="editorOption"></quillEditor>
             </el-form-item>
             <el-form-item label-width="130px">
-                <el-button @click="addEmit">添加段落</el-button >
+                <el-button @click="addEmit">添加段落</el-button>
                 <el-button @click="delEmit" type="info">删除本段落</el-button>
             </el-form-item>
     </el-form>
 </template>
 
 <script>
-  import InfoUeditor from 'vue-ueditor-wrap';
+  import 'quill/dist/quill.core.css'
+  import 'quill/dist/quill.snow.css'
+  import 'quill/dist/quill.bubble.css'
+  import {quillEditor, Quill} from 'vue-quill-editor'
+  import config from '@api/config';
+  import {container, ImageExtend, QuillWatch} from 'quill-image-extend-module';
+  Quill.register('modules/ImageExtend', ImageExtend);
   export default{
-    props:['data','index','isEdit'],
+    props:['data','index','isEdit','len'],
     name:'InfoParagraph',
     components:{
-      InfoUeditor
+      quillEditor
     },
     data(){
         return {
-          config:{
-            initialFrameWidth: null,
-            initialFrameHeight: 350,
-            imageUrlPrefix:"http://192.168.2.236:82",
-            serverUrl: '/api/icssman/file/uploadImage',
-            UEDITOR_HOME_URL: '/UEditor/',        //静态文件路径
-            toolbars:[['source','undo','redo','bold','italic','underline','fontborder','strikethrough','superscript','subscript','removeformat','formatmatch','autotypeset','blockquote',
-              'pasteplain','forecolor','backcolor','insertorderedlist','insertunorderedlist','selectall',
-              'cleardoc','rowspacingtop','rowspacingbottom','lineheight','customstyle','paragraph',
-              'fontfamily','fontsize','directionalityltr','directionalityrtl','indent','justifyleft',
-              'justifycenter','justifyright','justifyjustify','touppercase','tolowercase','link','simpleupload','insertimage','horizontal',
-              'date','time','spechars','fullscreen']]      //自定义工具
+          editorOption: {
+            modules: {
+              ImageExtend: {
+                loading: true,
+                name: 'upfile',
+                action: config.urls.promptServer,
+                response: (res) => {
+                  return config.imgHost+res.url;
+                }
+              },
+              toolbar: {
+                container: container,
+                handlers: {
+                  'image': function () {
+                    QuillWatch.emit(this.quill.id)
+                  }
+                }
+              }
+            }
+          },
+          form:{
+            position:[],
+            orderNo:0
           },
-          form:{},
           positions:[],               //位置列表
           rules:{
             isReason: [
@@ -67,18 +83,10 @@
           }
         }
     },
-    watch:{
-      'data.content':{          //content改变时传值
-        handler(newVal,oldVal){
-          this.emitVal();
-        }
-      }
-    },
-    created(){
+    mounted(){
       //显示位置枚举列表
       const pos = localStorage.getItem("icssEnumsData");
       this.positions = JSON.parse(pos)&&JSON.parse(pos).introducePositionEnum;
-      this.form = this.data;console.log(this.isEdit)
     },
     methods:{
       addEmit(){
@@ -87,11 +95,13 @@
       delEmit(){
         this.$emit("del",this.index);
       },
-      emitVal(){
-        let data = Object.assign({},this.data);
-        data =   Object.assign({},data,{position:this.data.position?this.data.position.join(","):''});
+      /*emitVal(){
+        let data = this.form;
+        let pst=this.form.position;
+        pst = typeof pst=='string'?pst:pst.join(',');
+        data =   Object.assign({},data,{position:this.form.position?pst:'',orderNo:this.index,text:''});
         this.$emit("change",this.index,data);
-      }
+      }*/
     }
   }
 </script>
@@ -100,5 +110,15 @@
    .is-error .el-form-item__error{
         top:auto;
     }
-
+   /**富文本编辑器样式修改***/
+   .ql-snow .ql-picker.ql-size .ql-picker-label::before,
+   .ql-snow .ql-picker.ql-size .ql-picker-item::before,
+   .ql-snow .ql-picker.ql-header .ql-picker-label::before,
+   .ql-snow .ql-picker.ql-header .ql-picker-item::before,
+   .ql-snow .ql-picker.ql-font .ql-picker-label::before,
+   .ql-snow .ql-picker.ql-font .ql-picker-item::before,
+   .ql-snow .ql-color-picker .ql-picker-label svg,
+   .ql-snow .ql-icon-picker .ql-picker-label svg{
+       vertical-align: top;
+   }
 </style>

+ 75 - 49
src/components/icss/MedicalInfo.vue

@@ -2,18 +2,22 @@
     <div>
         <crumbs title="医学术语属性">
             <el-form :inline="true" class="demo-form-inline">
-                <el-form-item label="医学术语:">
-                    <el-input size="mini" v-model="filter.proName" placeholder="输入术语" clearable></el-input>
+                <el-form-item label="术语:">
+                    <el-input size="mini" v-model="filter.termName" placeholder="输入术语"></el-input>
                 </el-form-item>
                 <el-form-item label="术语类型:">
-                    <el-select v-model="filter.termType" clearable placeholder="请选择" size="mini">
-                        <el-option
-                            v-for="item in termTypeList"
-                            :key="item.key"
-                            :label="item.name"
-                            :value="item.key">
-                        </el-option>
-                    </el-select>
+                  <el-select v-model="filter.type" 
+                  clearable 
+                  filterable 
+                  placeholder="请选择" 
+                  size="mini">
+                    <el-option
+                      v-for="item in typeList"
+                      :key="item.name"
+                      :label="item.name"
+                      :value="item.name">
+                    </el-option>
+                  </el-select>
                 </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
@@ -36,17 +40,27 @@
                         width="60">
                 </el-table-column>
                 <el-table-column
-                        prop="gmtOperate"
+                        prop="operTime"
                         label="操作时间"
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
-                        prop="questionName"
+                        prop="libName"
                         label="医学标准术语"
                         show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column
-                        prop="operatorName"
+                        prop="libType"
+                        label="术语类型"
+                        show-overflow-tooltip>
+                </el-table-column>
+                 <el-table-column
+                        prop="otherNames"
+                        label="同义词"
+                        show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column
+                        prop="operName"
                         label="操作人">
                 </el-table-column>
                 
@@ -55,7 +69,7 @@
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click="toEditProduct(scope.row)">修改</el-button>
                         <span style="margin:0 3px;">|</span>
-                        <el-button type="text" size="small" class="delete" @click="showDelDialog(scope.row.questionId)">删除</el-button>
+                        <el-button type="text" size="small" class="delete" @click="showDelDialog(scope.row)">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -80,41 +94,36 @@
       return {
         list: [],
         cacheData: {},
-        termTypeList: [
-            {
-              name:'类型1',
-              id:1,
-              key:1
-            },
-            {
-              name:'类型2',
-              id:2,
-              key:2
-            },
-            {
-              name:'类型3',
-              id:3,
-              key:3
-            },
-        ],
         currentPage: 1,
         pageSize: 10,
         total: 0,
         filter: {
-          proName: '',
-          termType:''
-        }
+          termName:'',
+          type:''
+        },
+        typeList:[]
       }
     },
     created() {
       this.getDataList();
+      this.getTypeList();
     },
     methods: {
       toEditProduct(row){
-        // this.$router.push({
-        //   name:'AddSimilarName',
-        //   params: {id:row.questionId,name:row.questionName}
-        // })
+
+        api.getMedicalInfoDetail({medicalId:row.medicalId}).then((res)=>{
+          const {code,data,msg} = res.data;
+          if(code=='0'){
+            const item = Object.assign({},row,data);
+            this.$router.push({name:'AddMedicalInfo',params:{isEdit:true,data:item}});
+          }else{
+            this.$message({
+              message: msg,
+              type: 'warning'
+            });
+          }
+        });
+
       },
       filterDatas(){
         this.currentPage = 1;
@@ -122,7 +131,11 @@
       },
       getDataList() {
         const param = this.getFilterItems();
-        /*api.similarName(param).then((res) => {
+        // const param = {
+        //   current: this.currentPage,
+        //   size: this.pageSize
+        // }
+        api.getMedicalInfoList(param).then((res) => {
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;
@@ -131,7 +144,19 @@
           }
         }).catch((error) => {
           console.log(error);
-        });*/
+        });
+      },
+      getTypeList(){
+        api.getAllLexiconRelationship({}).then((res)=>{
+          const data = res.data;
+          if(data.code==0){
+            this.typeList = data.data;
+          }else{
+            console.log(res.msg);
+          }
+        }).catch((error) => {
+          console.log(error);
+        });
       },
       getDetailList(id) {
         const param = {'id': id,};
@@ -139,9 +164,10 @@
       },
       getFilterItems() {
         const param = {
-          questionName: this.filter.proName,
+          name: this.filter.termName,
           current: this.currentPage,
-          size: this.pageSize
+          size: this.pageSize,
+          type:this.filter.type
         };
         return param;
       },
@@ -171,9 +197,9 @@
           resolve();
         }).catch(() => {});
       },
-      showDelDialog(id){
-        this.showConfirmDialog('删除该标准词,可能造成相关联的医学信息、术语关系、医学静态知识等信息全部删除,是否删除?',()=>{
-          api.delSimilarName({questionId:id}).then((res)=>{
+      showDelDialog(row){
+        this.showConfirmDialog('是否删除该标准词关联明细,可能对现有系统造成影响;是否删除?',()=>{
+          api.removeMedicalInfo({medicalId: row.medicalId}).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();
@@ -200,7 +226,7 @@
             'Content-Type': 'multipart/form-data'
           }
         }
-        api.uploadFile(formData,header).then((res)=>{
+        api.medicalInfoExcelIm(formData,header).then((res)=>{
           if(res.data.code==0){
             this.$message({
               message: '上传成功',
@@ -214,11 +240,11 @@
           }
         })
         this.getDataList();
-        /*//解决上传相同文件不触发change
+        //解决上传相同文件不触发change
         let inp = document.getElementById("upFile");
         inp.value = "";
-        */
-      }
+        
+      },
     }
   }
 </script>

+ 124 - 0
src/components/icss/MedicineInfoPg.vue

@@ -0,0 +1,124 @@
+<template>
+    <el-form :rules="rules" :model="data" ref="form" class="sub-form">
+        <p class="line"></p>
+        <!--<el-input v-model="form.orderNo" :value="index" type="hidden"></el-input>-->
+        <el-form-item label="是否属于诊断:" prop="isReason">
+            <el-select v-model="data.isReason" placeholder="请选择" :disabled="isEdit&&index<len">
+                <el-option label="否" :value="0"></el-option>
+                <el-option label="是" :value="1"></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="显示位置:" prop="position" label-width="130px">
+            <el-checkbox-group v-model="data.position" :disabled="isEdit&&index<len">
+                <el-checkbox v-for="it in positions" :key="it.key" :label="it.key">{{it.name}}</el-checkbox>
+            </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="标题" prop="title" label-width="130px">
+            <el-input v-model="data.title" maxlength="120"></el-input>
+        </el-form-item>
+        <el-form-item label="内容" prop="content" label-width="130px">
+            <quillEditor v-model="data.content" :options="editorOption"></quillEditor>
+        </el-form-item>
+        <!--<el-form-item label-width="130px">
+            <el-button @click="addEmit">添加段落</el-button>
+            <el-button @click="delEmit" type="info">删除本段落</el-button>
+        </el-form-item>-->
+    </el-form>
+</template>
+
+<script>
+  import 'quill/dist/quill.core.css'
+  import 'quill/dist/quill.snow.css'
+  import 'quill/dist/quill.bubble.css'
+  import {quillEditor, Quill} from 'vue-quill-editor'
+  import config from '@api/config';
+  import {container, ImageExtend, QuillWatch} from 'quill-image-extend-module';
+  Quill.register('modules/ImageExtend', ImageExtend);
+  export default{
+    props:['data','index','isEdit','len'],
+    name:'MedicineInfoParagraph',
+    components:{
+      quillEditor
+    },
+    data(){
+      return {
+        editorOption: {
+          modules: {
+            ImageExtend: {
+              loading: true,
+              name: 'upfile',
+              action: config.urls.promptServer,
+              response: (res) => {
+                return config.imgHost+res.url;
+              }
+            },
+            toolbar: {
+              container: container,
+              handlers: {
+                'image': function () {
+                  QuillWatch.emit(this.quill.id)
+                }
+              }
+            }
+          }
+        },
+        form:{
+          position:[],
+          orderNo:0
+        },
+        positions:[],               //位置列表
+        rules:{
+          isReason: [
+            { required: true, message: '请选择是否属于诊断', trigger: 'change' }
+          ],
+          position: [
+            { required: true, message: '请选择显示位置', trigger: 'change' }
+          ],
+          title: [
+            { required: true, message: '请输入段落标题', trigger: 'change' }
+          ],
+          content: [
+            { required: true, message: '请输入段落内容', trigger: 'change' }
+          ],
+        }
+      }
+    },
+    mounted(){
+      //显示位置枚举列表
+      const pos = localStorage.getItem("icssEnumsData");
+      this.positions = JSON.parse(pos)&&JSON.parse(pos).introducePositionEnum;
+    },
+    methods:{
+      /*addEmit(){
+        this.$emit("add");
+      },
+      delEmit(){
+        this.$emit("del",this.index);
+      },
+      emitVal(){
+        let data = this.form;
+        let pst=this.form.position;
+        pst = typeof pst=='string'?pst:pst.join(',');
+        data =   Object.assign({},data,{position:this.form.position?pst:'',orderNo:this.index,text:''});
+        this.$emit("change",this.index,data);
+      }*/
+    }
+  }
+</script>
+
+<style lang="less">
+    .is-error .el-form-item__error{
+        top:auto;
+    }
+    /**富文本编辑器样式修改***/
+    .ql-snow .ql-picker.ql-size .ql-picker-label::before,
+    .ql-snow .ql-picker.ql-size .ql-picker-item::before,
+    .ql-snow .ql-picker.ql-header .ql-picker-label::before,
+    .ql-snow .ql-picker.ql-header .ql-picker-item::before,
+    .ql-snow .ql-picker.ql-font .ql-picker-label::before,
+    .ql-snow .ql-picker.ql-font .ql-picker-item::before,
+    .ql-snow .ql-color-picker .ql-picker-label svg,
+    .ql-snow .ql-icon-picker .ql-picker-label svg{
+        vertical-align: top;
+    }
+</style>

+ 52 - 17
src/components/icss/MedicinePrompt.vue

@@ -2,12 +2,17 @@
     <div>
         <crumbs title="医学术语静态知识维护">
             <el-form :inline="true" class="demo-form-inline">
-                <el-form-item label="静态知识名称:">
-                    <el-input size="mini" v-model="filter.name" placeholder="静态知识名称" clearable></el-input>
+                <el-form-item label="医学标准术语:">
+                    <el-input size="mini" v-model="filter.term" placeholder="医学标准术语" clearable></el-input>
                 </el-form-item>
-                <el-form-item label="标签系统名称:">
-                    <el-input size="mini" v-model="filter.term" placeholder="术语标签" clearable></el-input>
+                <el-form-item label="标名称:">
+                    <el-input size="mini" v-model="filter.title" placeholder="标题名称" clearable></el-input>
                 </el-form-item>
+                <!--<el-form-item label="术语类型:">
+                    <el-select size="mini" v-model="filter.type" placeholder="术语类型" clearable>
+                        <el-option v-for="it in termTypes" :label="it.name" :value="it.name" :key="it.id"></el-option>
+                    </el-select>
+                </el-form-item>-->
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
                     <router-link to="/admin/LT-YXSYKWH-TJYXSYJTZS" style="margin:0 10px">
@@ -33,12 +38,21 @@
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
-                        prop="name"
+                        prop="conceptNameAndType"
                         label="医学标准术语">
                 </el-table-column>
+                <el-table-column
+                        prop="source"
+                        label="静态知识来源">
+                </el-table-column>
+                <!--<el-table-column
+                        prop="conceptType"
+                        label="术语类型"
+                        width="140">
+                </el-table-column>-->
                 <el-table-column
                         prop="title"
-                        label="静态知识名称"
+                        label="标题名称"
                         width="240">
                 </el-table-column>
                 <el-table-column
@@ -52,7 +66,7 @@
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click="toEditProduct(scope.row)">修改</el-button>
                         <span style="margin:0 3px;">|</span>
-                        <el-button type="text" size="small" @click="showDelDialog(scope.row.id)">删除</el-button>
+                        <el-button type="text" size="small" @click="showDelDialog(scope.row)">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -77,6 +91,7 @@
     name: 'MedicinePrompt',
     data: function () {
       return {
+        termTypes:[],
         list: [],
         cacheData: {},
         currentPage: 1,
@@ -85,15 +100,36 @@
         linkIn:[],
         pays:[],
         filter: {
-          name: '',
-          tagName:''
+          term: '',
+          title:''
         }
       }
     },
     created() {
       this.getDataList();
+      this.getTermTypes();
     },
     methods: {
+      getTermTypes(){
+        api.getAllType().then((res)=>{
+          if(res.data.code=='0'){
+            this.termTypes = res.data.data.records;
+          }
+        }).catch((error)=>{
+          console.log('获取术语类型失败');
+        });
+      },
+      /*async getTermTypes(){
+        let types = localStorage.getItem('termTypes');
+        if(!types){
+          types = await api.getAllType();
+          if(types.data.code=='0'){
+            this.termTypes = types.data.data.records;
+          }
+        }else{
+          this.termTypes = JSON.parse(types).records;
+        }
+      },*/
       toEditProduct(row){
         this.$router.push({
           name:'AddMedicinePrompt',
@@ -106,9 +142,6 @@
       },
       getDataList() {
         const param = this.getFilterItems();
-        // const param = {
-        //   'name':''
-        // };
         api.getConceptKnowledgeList(param).then((res) => {
           if (res.data.code == '0') {
             const data = res.data.data;
@@ -126,8 +159,8 @@
       },
       getFilterItems() {
         const param = {
-          term:this.filter.name,
-          conecpt_name:this.filter.term,
+          conceptName:this.filter.term,
+          title:this.filter.title,
           current: this.currentPage,
           size: this.pageSize
         };
@@ -152,16 +185,18 @@
         })
       },
       showConfirmDialog(msg,resolve){
-        this.$alert(msg, '提示', {
+        this.$confirm(msg, '提示', {
           confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          cancelButtonClass:'cancel',
           type: 'warning'
         }).then(() => {
           resolve();
         }).catch(() => {});
       },
-      showDelDialog(id){
+      showDelDialog(row){
         this.showConfirmDialog('是否删除该静态知识?',()=>{
-          api.delConceptInfo({id}).then((res)=>{
+          api.delConceptInfo({id:row.id}).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();

File diff ditekan karena terlalu besar
+ 10 - 3
src/components/icss/NoiseTemplate.vue


+ 2 - 2
src/components/icss/PhysicalExamTemplate.vue

@@ -139,7 +139,7 @@
       },
       getFilterItems() {
         const param = {
-          name: this.filter.proName,
+          deptName: this.filter.proName,
           current: this.currentPage,
           size: this.pageSize
         };
@@ -172,7 +172,7 @@
         }).catch(() => {});
       },
       showDelDialog(id){
-        this.showConfirmDialog('是否删除该科室症状?',()=>{
+        this.showConfirmDialog('是否删除该科室查体模板?',()=>{
           api.delPhysicalExamTemp({'deptId':id}).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');

+ 3 - 3
src/components/icss/PromptTagPool.vue

@@ -80,7 +80,7 @@
         }
       },
       selected(newVal, preVal) {
-        if (JSON.stringify(newVal) != JSON.stringify(preVal)) {console.log(newVal)
+        if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
           this.rightTagsList = newVal
         }
       },
@@ -199,11 +199,11 @@
       float: left;
     }
     .pool{
-      .el-input__inner {
+    .el-input .el-input__inner {
         width: 100%;
         border: 1px solid #c0c4cc;
         border-radius: 0;
-        height: 35px;
+        height: 42px;
         border-bottom: none;
       }
       .el-input__prefix {

+ 50 - 23
src/components/icss/PubIndeptTag.vue

@@ -117,6 +117,7 @@
                 ></el-input></el-col>
             </el-form-item>
             <el-form-item
+                    v-if="form.region1 != 5"
                     label="选择项之间链接:"
                     prop="region5"
             >
@@ -128,7 +129,7 @@
                         @change="sendData"
                 ></el-input>
             </el-form-item>
-            <el-form-item
+            <!-- <el-form-item 
                     label="能否当项目检索:"
                     prop="region6"
             >
@@ -146,7 +147,7 @@
                             value="0"
                     ></el-option>
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
            
             <el-form-item
                     label="年龄:"
@@ -173,28 +174,43 @@
                 @input="sendData"
               ></el-input>
             </el-form-item>
+
+          <div>
             <el-form-item
                     label="正常值范围:"
-                    class="fix-inp"
-                    prop="region13"
-                    v-if="form.region1==5 && form.region2==6"
+                    prop="minNormalVal"
+                    class="ages"
+                    v-if="form.region1==5 && form.region2==6 || form.region2==7"
             >
-                <el-col :span="7">
-                <el-input v-model="form.minNormalVal"
-                        :disabled="!form.region1"
-                        maxLength="30"
-                        @change="sendData"
-                ></el-input></el-col>
-                <el-col :span="8"> ~</el-col>
-                <el-col :span="7">
                 <el-input
-                    v-model="form.maxNormalVal"
-                    :disabled="!form.region1"
-                    maxLength="30"
-                    @change="sendData"
-                ></el-input></el-col>
+                        v-model.number="form.minNormalVal"
+                        :disabled="!form.region1"
+                         type="number"
+                         maxLength="4"
+                        ref="valage1"
+                        @input="sendData"
+                ></el-input>
             </el-form-item>
-            
+            <span
+              v-if="form.region1==5 && form.region2==6 || form.region2==7"
+            > ~ 
+            </span>
+            <el-form-item
+              prop="maxNormalVal"
+              class="ages maxAges"
+              v-if="form.region1==5 && form.region2==6 || form.region2==7"
+            > 
+              <el-input
+                v-model.number="form.maxNormalVal"
+               :disabled="!form.region1"
+                type="number"
+                ref="valage2"
+                maxLength="4"
+                @input="sendData"
+              ></el-input>
+            </el-form-item>
+          </div>
+          
         </el-form>
     </div>
 </template>
@@ -250,7 +266,7 @@
           '1':['1','2','5','6','7','11','99'],
           '3':['1','2','5','6','7', '11',],
           '4':['1','2','6','7', '11',],
-          '5':['1','7']
+          '5':['1','6']
         },
         rules: {
           region1: [
@@ -277,7 +293,14 @@
           ],
           region9: [
             { required: true, message: '请输入最大年龄', trigger: 'change' }
+          ],
+           minNormalVal: [
+            { required: true, message: '请输入正常值范围', trigger: 'change' }
+          ],
+          maxNormalVal: [
+            { required: true, message: '请输入正常值范围', trigger: 'change' }
           ]
+          
         },
         tmpSex: '通用',
         tmpOwn: '',
@@ -338,12 +361,14 @@
         let param = {
           "existName": this.form.region3,
           "type": this.form.region1,
+          "notTagType":[8,10],        //去掉文字标签查重
           "notIds":[this.$props.editData.id]
         };
         api.validateSystomName(param).then((res) => {
           if (res.data.code === '0') {
             if(res.data.data && res.data.data.length != 0){
-              callback(new Error('该系统名称已存在'));
+              this.warning('标签系统名称已重复,无法建立');
+              // callback(new Error('该系统名称已存在'));
             }else{
               callback();
             }
@@ -365,11 +390,11 @@
         if(type === 1) {
           this.form.region2 = '';
           this.labelTypes = this.labelTypesList.filter(item => this.labelTypesMaps[tmpData].indexOf(item.val) > -1)
-          
+          this.initForm()
         }
         if(type === 2) {
           this.initForm()
-          
+          this.$emit('changeType', type, false)
         }
         //console.log(tmpData)
         this.changeSex(tmpData);
@@ -396,6 +421,7 @@
         this.form.suffix = ''
         this.form.minNormalVal = ''
         this.form.maxNormalVal = ''
+        this.form.region5 = ''
       },
     }
   }
@@ -435,6 +461,7 @@
         margin-bottom: 20px;
     }
     .el-form-item__error {
+        width: 200px;
         top: 28px;
     }
     .el-form-item__label {

+ 11 - 7
src/components/icss/PubTagGroup.vue

@@ -169,8 +169,8 @@
       </el-form-item>
       <el-form-item class="verticalMiddle" label="选择子项时是否复制主项标签:" prop="region10" v-if="form.region2 == 6">
         <el-select v-model="form.region10" :disabled="!form.region1 || form.region2 == 11">
-          <el-option label="不可以" value="1"></el-option>
-          <el-option label="可以" value="0"></el-option>
+          <el-option label="不可以" value="0"></el-option>
+          <el-option label="可以" value="1"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="是否显示加号:" prop="region11" v-if="form.region2 == 2 || form.region2 == 3">
@@ -229,7 +229,7 @@ export default {
         region7: '3',       //性别
         region8: '0',          //最小年龄
         region9: '200',         //最大年龄
-        region10: '0',        //是否复制主标签
+        region10: '1',        //是否复制主标签
         region11: '0',       //是否复制当前模块
         region12:'1',        //是否为症状
         tagPool:[],          //标签池数据
@@ -347,6 +347,10 @@ export default {
       })
     },
     searchTagList() {
+      const editData = this.$props.editData;
+      if(editData.id){
+        return;
+      }
       let region1 = this.form.region1, region2 = this.form.region2;
       let paramFst = !!region2 ? api.getGroupParams(region2): {};
       let paramSec = {
@@ -355,7 +359,7 @@ export default {
         "tagName":'',
         "notIds": [],
       }
-      console.log(paramFst,paramSec,7787)
+      // console.log(paramFst,paramSec,7787)
       let params = Object.assign({},paramFst,paramSec)
       api.searchTagList(params).then((res) => {
         if (res.data.code === '0') {
@@ -367,8 +371,8 @@ export default {
       if(this.form.region3.trim() == ''){ return }
       let param = {
         "existName": this.form.region3,     
-        // "type": this.form.region1,
-        "notTagType":[8],        //去掉文字标签查重
+        "type": this.form.region1,  
+        "notTagType":[8,10],        //去掉文字标签查重
       }
       api.validateSystomName(param).then((res) => {
         if (res.data.code === '0') {
@@ -457,7 +461,7 @@ export default {
     },
     initForm() {
       this.form.region12 = '1'
-      this.form.region10 = '0'
+      this.form.region10 = '1'
       this.form.region11 = '0'
 
     }

+ 38 - 15
src/components/icss/PubTagPartDetail.vue

@@ -37,7 +37,7 @@
           v-if="choose == 'single'"
         >
           <template v-for="item in poolDetailList[0]">
-            <!-- <span class="hzx ellipsis" v-for="part in item.questionDetailList" :title="'[ '+item.name+' ]'" :key="part.id">{{part.name}}</span> -->
+            <span class="hzx ellipsis" v-for="part in item.questionDetailList" :title="'[ '+item.name+' ]'" :key="part.id">{{part.name}}</span>
           </template>
         </div>
         <div
@@ -46,14 +46,14 @@
           @click="selectPart(0)"
           v-else
         >
-          <!-- <span class="hzx ellipsis" v-for="item in poolDetailList[0][0].questionDetailList" :title="'[ '+item.name+' ]'" v-show="choose == 'multiple'" :key="item.id">{{item.name}}</span> -->
+          <span class="hzx ellipsis" v-for="item in poolDetailList[0][0].questionDetailList" :title="'[ '+item.name+' ]'" v-show="choose == 'multiple'" :key="item.id">{{item.name}}</span>
         </div>
         <div class="onlyBottom pubList">
           <ul class="clearfix">
             <li v-for="n in 5"
               :key="n + 'part'"
               class="onlyBottomPart "
-              :class="selectArr[n]?'activeBgc':(n==1 && sign == 6?'activeBgcF5':'')"
+              :class="selectArr[n]?'activeBgc':''"
               :style="{borderRight:n==5?'0':''}"
               @click="selectPart(n)"
             >
@@ -66,7 +66,7 @@
               </ul>
               <ul v-else>
                 <template v-if="n == 1">
-                  <li class="partDetail ellipsis" v-for="item in poolDetailList[n][0].questionDetailList" :style="getStyleR(item.id)?styleR:null" :title="'[ '+item.name+' ]'" :key="item.name">
+                  <li class="partDetail ellipsis" v-for="item in poolDetailList[n][0].questionDetailList" :style="getStyleR(item.id)?styleR:null" :title="'[ '+item.name+' ]'" :key="item.id">
                     [ {{item.name}} ]
                   </li>
                 </template>
@@ -153,6 +153,7 @@ export default {
       multipleItem:[],         //右侧选中的单条标签
       currentTipLis:[],         //右侧选中的标签提示
       tmpNum:0,
+
     }
   },
   mounted(){
@@ -524,19 +525,41 @@ export default {
                     });
                     return;
                   }else{
-                    if((idx == 0 && (tmpArr[0].questionDetailList && tmpArr[0].questionDetailList.length > 1)) || (idx == 1 && (tmpArr[0].tagType != 1 && tmpArr[0].tagType != 2))){      //第一列
-                      this.$message({
-                        showClose: true,
-                        message: '添加的数据有误',
-                        type: 'warning'
-                      });
-                      return;
-                    }else{
-                      this.poolDetailList[idx] = tmpArr;
+                    if(idx == 0){//互斥
+                      if(tmpArr[0].controlType != 1 || (tmpArr[0].questionDetailList && tmpArr[0].questionDetailList.length > 1)){
+                        this.$message({
+                          showClose: true,
+                          message: '添加的数据有误',
+                          type: 'warning'
+                        });
+                        return;
+                      }else{
+                        this.poolDetailList[idx] = tmpArr;
+                      }
+                    }else{//第一列伴无
+                      if(tmpArr[0].controlType != 2){
+                        this.$message({
+                          showClose: true,
+                          message: '添加的数据有误',
+                          type: 'warning'
+                        });
+                        return;
+                      }else if(tmpArr[0].questionDetailList && tmpArr[0].questionDetailList.length > 0){
+                        if(!tmpArr[0].questionDetailList[0].code){
+                          this.$message({
+                            showClose: true,
+                            message: '添加的数据有误',
+                            type: 'warning'
+                          });
+                          return;
+                        }else{
+                          this.poolDetailList[idx] = tmpArr;
+                        }
+                      }
                     }
                   }
                 }else{
-                  if(tmpArr[0].tagType == 1){
+                  if(tmpArr[0].tagType != 4){
                     this.$message({
                         showClose: true,
                         message: '添加的数据有误',
@@ -553,7 +576,7 @@ export default {
               }else{
                 ++num;
                 if(num == 6){
-                  if(tmpArr[0].tagType == 1){
+                  if(tmpArr[0].tagType != 4){
                     this.$message({
                         showClose: true,
                         message: '添加的数据有误',

+ 62 - 1
src/components/icss/PubTemplateGroup.vue

@@ -11,7 +11,7 @@
         label="选择归属:"
         prop="region1"
       >
-        <span class="changeTips">改变归属后,模板明细将会恢复到默认状态</span>
+        <span class="changeTips">改变归属后,模板内容将会恢复到默认状态</span>
         <el-select
           :disabled="!!editData.id"
           v-model="form.region1"
@@ -26,6 +26,26 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <!-- <el-form-item
+        label="选择子模板归属:"
+        prop="region3"
+        v-if="form.region1 == 5"
+      >
+        <span class="changeTips">改变子模板归属后,模板内容将会恢复到默认状态</span>
+        <el-select
+          :disabled="!!editData.id"
+          v-model="form.region3"
+          placeholder="请选择子模板"
+          @change="sendData"
+        >
+          <el-option
+            v-for="item in sonLis"
+            :label="item.name"
+            :value="item.key+''"
+            :key="item.key"
+          ></el-option>
+        </el-select>
+      </el-form-item> -->
       <el-form-item
         label="模板名称:"
         prop="region2"
@@ -54,10 +74,25 @@ export default {
   props:['editData'],
   data() {
     return {
+      numWord:0,
       Adscriptions:[],
+      sonLis:[{
+        name:'空',
+        key:'-1',
+      },{
+        name:'主诉模板',
+        key:'1'
+      },{
+        name:'现病史模板',
+        key:'2'
+      },{
+        name:'现病史空模板',
+        key:'3'
+      }],
       form: {
         region1: '',    //归属
         region2: '',     //模板名称
+        region3: '-1',     //子模板
         tagPool:[],      //标签池
       },
       rules: {
@@ -68,18 +103,28 @@ export default {
           { required: true, message: '请输入模板名称', trigger: 'change' },
           // { validator: validatePass2, trigger: 'blur' },
         ],
+        region3: [
+          { required: true, message: '请选择子模板归属', trigger: 'change' },
+          // { validator: validatePass2, trigger: 'blur' },
+        ],
       },
     }
   },
   beforeMount:function(){
     let templateOwn = localStorage.getItem('icssEnumsData') ? JSON.parse(localStorage.getItem('icssEnumsData')).moduleTypeEnum : []
+    let guisu = localStorage.getItem('guisu') ? JSON.parse(localStorage.getItem('guisu')) : []
+    for(let k = 0;k < guisu.length;k++){
+      templateOwn = templateOwn.filter(item => item.key != guisu[k])
+    }
     this.Adscriptions = templateOwn;
   },
   mounted() {
     const editData = this.$props.editData;
+    let templateOwn = localStorage.getItem('icssEnumsData') ? JSON.parse(localStorage.getItem('icssEnumsData')).moduleTypeEnum : []
     if(editData.id){      //修改
       // const trans = utils.transformKeys(editData,2);
       this.form = Object.assign({},this.form,editData);
+      this.Adscriptions = templateOwn
       this.form.region1 = (editData.type+'')
       this.form.region2 = editData.name
     }
@@ -87,6 +132,22 @@ export default {
     // this.searchTagList()
   },
   methods:{
+    changes(){
+      let nameVal = this.form.region2
+      console.log(nameVal.length)
+      if(nameVal.length == 10){
+        this.$message({
+          message: '最多输入120个字',
+          type: 'warning',
+          showClose: true,
+        });
+      }
+      if(nameVal.length == 10){
+        this.numWord = 10
+      }else{
+        this.numWord = 0
+      }
+    },
     sendData(val){
       this.$emit('changeVal', this.form, false)
     },

+ 3 - 3
src/components/icss/SingleSelect.vue

@@ -6,15 +6,15 @@
                     <el-checkbox-button  v-if=" !(ascription == 5 && type == 1 || type == 2 || type == 11) " :label="i" :disabled="hasNone==i||hasBan==i|| hasError==i || (hasDefault!=-1&&hasDefault!=i)||focusOn==-1">默认选中</el-checkbox-button>
                 </el-checkbox-group>
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="type!=1&&(focusOn==i||(focusOn==-1&&i==0))" :key="2+i" v-model="rows[i].isNone" @change="emitValues(i,'hasNone',rows[i].isNone)">
-                    <el-checkbox-button  v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="hasBan==i || hasError==i ||focusOn==-1">同“无”类型</el-checkbox-button>
+                    <el-checkbox-button  v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="rows[i].isBan || hasError==i ||focusOn==-1">同“无”类型</el-checkbox-button>
                 </el-checkbox-group>
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="type!=1&&(focusOn==i||(focusOn==-1&&i==0))" :key="3+i" v-model="rows[i].isBan" @change="emitValues(i,'hasBan',rows[i].isBan)">
-                    <el-checkbox-button v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="hasNone==i || hasError==i||focusOn==-1">同“伴”类型</el-checkbox-button>
+                    <el-checkbox-button v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="rows[i].isNone || hasError==i||focusOn==-1">同“伴”类型</el-checkbox-button>
                 </el-checkbox-group>
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="focusOn==i||(focusOn==-1&&i==0)" :key="4+i" v-model="rows[i].isError" @change="emitValues(i,'hasError',rows[i].isError)">
                     <el-checkbox-button v-if="ascription==5 && (type == 1 || type != 11)" :label="i" :disabled="hasDefault==i||hasBan==i ||hasNone==i ||(hasError!=-1&&hasError==i)||focusOn==-1">标记异常选项</el-checkbox-button>
                 </el-checkbox-group>
-                 <span v-if="type == 11" class="tip">可输入"()", 当作可输入内容的占位符</span>
+                 <span v-if="type == 11" class="tip">可输入中文全角括号"()", 当作可输入内容的占位符</span>
                 <el-button type="danger" size="small" class="del" @click="delRow">删除</el-button>
                
             </div>

+ 37 - 2
src/components/icss/TemplateMaintenance.vue

@@ -52,7 +52,7 @@
                         label="操作">
                     <template slot-scope="scope">
                         <el-button  @click="modifyIndeptTag(scope.row)" type="text" size="small">修改</el-button>
-                        <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
+                        <!-- <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button> -->
                     </template>
                 </el-table-column>
             </el-table>
@@ -97,9 +97,44 @@
       this.getDropList().then(() => {
         this.getDataList()
       })
-
+      this.getSubTemplate()
     },
     methods: {
+      getSubTemplate() {
+        let param = {
+          noIds:this.subTmpList,
+        }
+        api.getModuleInfoSub(param).then((res) => {
+          if (res.data.code === '0') {
+            let result = res.data.data
+            let arr = [],main = '',now = '',nowEmpt = '',other = '';
+            for(let i = 0;i < result.length;i++){
+              if(result[i].name == '主诉模板'){
+                if(!main){
+                  main = 1
+                  arr.push(main)
+                }
+              }else if(result[i].name == '现病史模板'){
+                if(!now){
+                  now = 2
+                  arr.push(now)
+                }
+              }else if(result[i].name == '现病史空模板'){
+                if(!nowEmpt){
+                  nowEmpt = 3
+                  arr.push(nowEmpt)
+                }
+              }else if(result[i].name == '其他史模板'){
+                if(!other){
+                  other = 4
+                  arr.push(other)
+                }
+              }
+            }
+            localStorage.setItem('guisu',JSON.stringify(arr))
+          }
+        })
+      },
       getDropList() {
         let templateOwn = localStorage.getItem('icssEnumsData') ? JSON.parse(localStorage.getItem('icssEnumsData')).moduleTypeEnum : []
         this.Adscriptions = templateOwn;

+ 2 - 0
src/components/icss/TemplateMaintenanceWrap.vue

@@ -15,6 +15,7 @@
         v-if="dataPub.region1"
         :pool="dataPub.tagPool"
         :type="dataPub.region1"
+        :sign="dataPub.region3"
         :options="editData"
          @changeActionData="changeActionData"
       >
@@ -82,6 +83,7 @@ export default {
         "modelDetils": detailLis,
         "name": name,
         "type": type,
+        "flag": type == 5?3:'',
         "textType": type,
         "id":this.editData.id || ''
       }

+ 2 - 2
src/routes.js

@@ -178,7 +178,7 @@ export default [
       {path:'LT-YXSJWH-TJMZSM',component:AddDisclInfo,name:'AddDisclInfo'},     //免责声明-添加/修改
       {path:'LT-YXSJWH-MBWH',component:TemplateMaintenance,name:'TemplateMaintenance'},     //模板维护
       {path:'LT-YXSJWH-CTMBWH',component:PhysicalExamTemplate,name:'PhysicalExamTemplate'},     //查体模板维护
-      {path:'LT-YXSJWH-TJCTMB',component:AddPhysicalExamTemp,name:'AddPhysicalExamTemp'},     //查体模板维护
+      {path:'LT-YXSJWH-TJCTMB',component:AddPhysicalExamTemp,name:'AddPhysicalExamTemp'},     //查体模板维护--添加
       {path:'LT-YXSJWH-TJMBWH',component:TemplateMaintenanceWrap,name:'TemplateMaintenanceWrap'},     //模板维护-添加修改
       {path:'LT-YXSJWH-TJTSXX',component:AddPromptInfo,name:'AddPromptInfo'},         //提示信息维护-添加
       {path:'LT-YXSJWH-TSXXXQ',component:PromptDetail,name:'PromptDetail'},         //提示信息维护详情
@@ -191,7 +191,7 @@ export default [
       {path:'LT-YXSYKWH-TJYXSY',component:AddMedicalName,name:'AddMedicalName'},     //医学术语--命名维护
       {path:'LT-YXSYKWH-YXSYGXWH',component:MedicalRelation,name:'MedicalRelation'},     //医学术语--关系维护
       {path:'LT-YXSYKWH-TJYXSYGX',component:AddMedicalRelation,name:'AddMedicalRelation'},     //医学术语--关系维护-添加
-      {path:'LT-YXSYKWH-YXSYXXWH',component:MedicalInfo,name:'MedicalInfo'},  //医学术语维护-信息维护(属性维护)
+      {path:'LT-YXSYKWH-SYYXSXWH',component:MedicalInfo,name:'MedicalInfo'},  //医学术语维护-信息维护(属性维护)
       {path:'LT-YXSYKWH-TJYXSYXX',component:AddMedicalInfo,name:'AddMedicalInfo'},  //医学术语维护-信息维护(属性维护) -- 添加
       {path:'LT-YXSYKWH-YXSYLXWH',component:MedicalType,name:'MedicalType'},     //医学术语--类型维护
     ]