Преглед на файлове

合并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

liucf преди 6 години
родител
ревизия
0c12c5e771

+ 6 - 0
src/api/config.js

@@ -106,6 +106,12 @@ export default {
     'addSimilarName': 'api/icssman/retrieval/addTagRetrieval', //别名维护-添加、修改
     'searchLable': 'api/icssman/questionInfo/index', //标签检索
     'uploadFile': 'api/icssman/retrieval/retrievalExcelIm', //别名维护-导入
+    'discInformation': 'api/icssman/disclaimerInformation/getDisclaimerInformations', //免责声明
+    'addDiscInformation': 'api/icssman/disclaimerInformation/addDisclaimerInformations', //免责声明-新增
+    'modifDiscInformation': 'api/icssman/disclaimerInformation/updateDisclaimerInformations', //免责声明-修改
+    'delDiscInformation': 'api/icssman/disclaimerInformation/cancelDisclaimerInformations', //免责声明-删除
+    'closeInformation': 'api/icssman/disclaimerInformation/endDisclaimerInformations', //免责声明-停用
+    'openInformation': 'api/icssman/disclaimerInformation/startDisclaimerInformations', //免责声明-启用
 	},
 	menuIconList: { //菜单对应图标
 		'YH-KZT': 'el-icon-menu',

+ 18 - 0
src/api/icss.js

@@ -93,4 +93,22 @@ export default {
     uploadFile(param) {//别名维护-导入
         return axios.post(urls.uploadFile, param)
     },
+    discInformation(param) {//免责声明
+        return axios.post(urls.discInformation, param)
+    },
+    addDiscInformation(param) {//免责声明-新增
+        return axios.post(urls.addDiscInformation, param)
+    },
+    modifDiscInformation(param) {//免责声明-修改
+        return axios.post(urls.modifDiscInformation, param)
+    },
+    delDiscInformation(param) {//免责声明-删除
+        return axios.post(urls.delDiscInformation, param)
+    },
+    closeInformation(param) {//免责声明-停用
+        return axios.post(urls.closeInformation, param)
+    },
+    openInformation(param) {//免责声明-停用
+        return axios.post(urls.openInformation, param)
+    },
 }

+ 1 - 0
src/api/utils.js

@@ -175,6 +175,7 @@ export default {
   transformKeys(data, tagFlag){   //tagFlag:独立标签还是标签组 ()
     const maps = {
       "controlType": 'region2',                            //控件类型(0:默认值 1:下拉单选 2:下拉多选 6:文本框 7:数字键盘文本框 99:联合推送)
+      "tagType": 'region2',              //标签类型
       "id": "id",                                    //新增id置空
       "type": 'region1',                //标签归属
       "tagName": 'region3',             //系统名称

+ 2 - 2
src/components/icss/AddDeptInfo.vue

@@ -141,7 +141,7 @@
   .el-button{
     margin: 30px 0 0 20px;
   }
-  .contents{
+  /* .contents{
     position: relative;
     .back{
       position: absolute;
@@ -150,7 +150,7 @@
       z-index: 7;
       cursor: pointer;
     }
-  }
+  } */
   .el-textarea{
     width: 97%;
   }

+ 195 - 0
src/components/icss/AddDisclInfo.vue

@@ -0,0 +1,195 @@
+<!-- 添加机构信息 By_liucf -->
+<template>
+    <div>
+        <crumbs :title="topInfo" linkTo="/admin/LT-YXSJWH-MZSMWH">
+        </crumbs>
+        <div class="contents">
+            <el-form ref="form" :label-position="labelPosition" :model="form" :rules="rules" label-width="65px" class="add-discl-form">
+                <el-form-item label="标题:" prop="title">
+                    <el-input v-model="form.title" placeholder="请输入标题"></el-input>
+                </el-form-item>
+                <el-form-item label="内容:" prop="description" class="discDesc">
+                    <el-input type="textarea" :rows="3" placeholder="请输入内容述" v-model="form.description" maxlength="1024"></el-input>
+                </el-form-item>
+                <el-form-item label="归属:" prop="disclaimerCode">
+                    <el-select v-model="form.disclaimerCode" clearable placeholder="请选择">
+                      <el-option
+                        v-for="item in options"
+                        :key="item.key"
+                        :label="item.name"
+                        :value="item.key">
+                      </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-button class="disclButn" size="small" type="primary" @click="addDiscl">{{text}}</el-button>
+            </el-form>
+        </div>
+    </div>
+</template>
+
+<script>
+  import api from '@api/icss.js';
+  export default {
+    name: 'AddDisclInfo',
+    data(){
+      const titleVaild = (rule, value, callback) => {
+        if (!value) {
+          return callback(new Error('请输入标题'));
+        }
+        if (value.length > 30) {
+           this.form.name = value.substr(0, 120);
+           this.$message({
+             showClose: true,
+             type: 'warning',
+             message: '已超过最大字数限制'
+           })
+        }
+        callback();
+      };
+      /*const descVaild = (rule, value, callback) => {
+        if (!value) {
+          return callback(new Error('请输入内容'));
+        }
+        if (value.length > 1024) {
+           this.form.name = value.substr(0, 120);
+           this.$message({
+             showClose: true,
+             type: 'warning',
+             message: '科室名称最多可输入1024个字'
+           })
+        }
+        callback();
+      };*/
+      const disclVaild = (rule, value, callback) => {
+        if (!value) {
+          return callback(new Error('请选择归属'));
+        }
+        callback();
+      };
+      return {
+        id:null,
+        labelPosition:'right',
+        options:[],
+        form: {
+          title: '',
+          description: '',//内容
+          disclaimerCode:'' //归属
+        },
+        rules: {
+          title:[
+            { required: true, validator: titleVaild, trigger: ['blur', 'change'] },
+            { required: true, message: '请输入标题', trigger: ['blur', 'change'] }
+          ],
+          description:[
+            // { required: true, validator: descVaild, trigger: ['blur', 'change'] },
+            { required: true, message: '请输入内容', trigger: ['blur', 'change'] }
+          ],
+          disclaimerCode:[
+            { required: true, validator: disclVaild, trigger: ['blur', 'change'] },
+            { required: true, message: '请选择归属', trigger: ['blur', 'change'] }
+          ],
+        },
+        text:'确定添加',
+        topInfo:'免责声明维护-添加免责声明',
+        toast:'添加成功'
+      }
+    },
+    created(){
+      const params = JSON.parse(localStorage.getItem("icssEnumsData"));
+      this.options = params.disclaimerCodeEnum;
+      // 修改
+      const data = this.$route.params.info;
+      if(data){
+        this.id = data.id;
+        this.text = "确定修改";
+        this.topInfo = "免责声明维护-修改";
+        this.toast = "修改成功";
+        this.form.title = data.title;
+        this.form.description = data.description;
+        this.form.disclaimerCode = data.disclaimerCode;
+      }
+    },
+    methods: {
+      addDiscl() {
+        this.$refs.form.validate((valid)=> {
+          if (valid) {
+            // 有id是修改,没有id是添加
+            if(this.id){
+              let param = {
+                id:this.id,
+                title:this.form.title,
+                description:this.form.description,
+                disclaimerCode:this.form.disclaimerCode
+              }
+              api.modifDiscInformation(param).then((res) => {
+                if (res.data.code == '0') {
+                  this.$message({showClose: true,message: this.toast, type: 'success'});
+                  this.$router.push({path: 'LT-YXSJWH-MZSMWH'});
+                } else {
+                  this.$message({
+                    showClose: true,
+                    message: res.data.msg,
+                    type: 'warning'
+                  });
+                }
+              }).catch((error) => {
+                this.$message({
+                  showClose: true,
+                  message: "服务器正忙...",
+                  type: 'warning'
+                });
+              })
+            }else{
+              api.addDiscInformation(this.form).then((res) => {
+                if (res.data.code == '0') {
+                  this.$message({showClose: true,message: this.toast, type: 'success'});
+                  this.$router.push({path: 'LT-YXSJWH-MZSMWH'});
+                } else {
+                  this.$message({
+                    showClose: true,
+                    message: res.data.msg,
+                    type: 'warning'
+                  });
+                }
+              }).catch((error) => {
+                this.$message({
+                  showClose: true,
+                  message: "服务器正忙...",
+                  type: 'warning'
+                });
+              })
+            }  
+          }
+        });
+      },
+      back(){
+        this.$router.go(-1);
+      }
+    }
+  }
+</script>
+
+<style lang="less" >
+    @import "../../less/admin.less";
+
+    .add-discl-form {
+        background: #fff;
+        padding: 20px 20px 30px;
+    }
+
+  // .el-button{
+  .disclButn{
+    margin: 30px 0 0 20px;
+  }
+  
+  .discDesc{
+    // .el-textarea{
+    //   width: 97%;
+    // }
+    margin-top: 10px;
+    margin-bottom: 25px; 
+    .el-form-item__error{
+      top:70px;
+    }
+  }
+</style>

+ 1 - 6
src/components/icss/DeptInfo.vue

@@ -189,12 +189,7 @@
 
 <style lang="less">
     @import "../../less/admin.less";
-    .status-span{
-        font-size: 12px;
-        margin-right:10px;
-        color: unset;
-    }
     .delete{
-        color: red
+        color: red !important;
     }
 </style>

+ 47 - 0
src/components/icss/DiscInfoDetail.vue

@@ -0,0 +1,47 @@
+<template>
+  <div>
+    <crumbs title="免责声明维护-详情" linkTo="/admin/LT-YXSJWH-MZSMWH"></crumbs>
+    <div class="contents">
+      <div class="deptbox">
+        <p class="titl">标题</p>
+        <p>{{data.title}}</p>
+        <p class="titl marg">内容</p>
+        <p v-html="data.description">{{data.description}}</p>
+        <p class="titl marg">归属</p>
+        <p>{{data.disclaimerCode}}</p>
+      </div>
+    </div>   
+  </div>
+</template>
+<script type="text/javascript">
+  export default{
+    name:'DiscInfoDetail',
+    data(){
+      return{
+        data:{}
+      }
+    },
+    created(){
+      this.data = this.$route.params.info;
+    },
+    methods:{
+    }
+  }
+</script>
+<style lang="less" scoped>
+  @import "../../less/admin.less";
+  .deptbox{
+    // width: 100%;
+    background: #fff;
+    padding: 20px 20px 30px;
+    font-size: 14px;
+    // color: #545455;
+    text-align: left; 
+    .titl{
+      font-weight: bold;
+    }
+    .marg{
+      margin-top: 20px;
+    }
+  }
+</style>

+ 224 - 0
src/components/icss/DisclaimerInformation.vue

@@ -0,0 +1,224 @@
+<template>
+    <div>
+        <crumbs title="免责声明维护">
+            <el-form :inline="true" class="demo-form-inline">
+                <el-form-item label="标题:">
+                    <el-input size="mini" v-model="filter.title" placeholder="输入标题"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button size="mini" @click="filterDatas">确认</el-button>
+                    <router-link to="/admin/LT-YXSJWH-TJMZSM" style="margin:0 10px">
+                        <el-button size="mini" type="warning">添加</el-button>
+                    </router-link>
+                </el-form-item>
+            </el-form>
+        </crumbs>
+        <div class="contents">
+            <el-table :data="list"
+                      border
+                      style="width: 100%">
+                <el-table-column
+                        type="index"
+                        :index="indexMethod"
+                        label="编号"
+                        width="60">
+                </el-table-column>
+                <el-table-column
+                        prop="gmtCreate"
+                        label="操作时间"
+                        :show-overflow-tooltip="true">
+                </el-table-column>
+                <el-table-column
+                        prop="modifier"
+                        label="操作人">
+                </el-table-column>
+                <el-table-column
+                        prop="title"
+                        label="标题">
+                </el-table-column>
+                <el-table-column
+                        prop="disclaimerCode"
+                        label="归属">
+                </el-table-column>
+                <el-table-column
+                        label="状态">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" :class="{forbid:scope.row.status==0}" @click="toOpen(scope.row)">启用</el-button>
+                        <span style="margin:0 3px;">|</span>
+                        <el-button type="text" size="small" :class="['delete',{'forbid':scope.row.status==1}]" @click="toClose(scope.row)">停用</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" @click="toEditDiscl(scope.row)">修改</el-button>
+                        <span style="margin:0 3px;">|</span>
+                        <el-button type="text" size="small" class="delete" @click="showDelDialog(scope.row.id)">删除</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        label="详情">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" @click="getDetail(scope.row)">详情</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination v-if="total>pageSize"
+                           :current-page.sync="currentPage"
+                           @current-change="currentChange"
+                           background
+                           :page-size="pageSize"
+                           layout="total,prev, pager, next, jumper"
+                           :total="total">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+
+<script>
+  import api from '@api/icss.js';
+  import utils from '@api/utils.js';
+
+  export default {
+    name: 'DisclaimerInformation',
+    data: function () {
+      return {
+        list: [],
+        cacheData: {},
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        linkIn:[],
+        pays:[],
+        filter: {
+          title: ''
+        }
+      }
+    },
+    created() {
+      this.getDataList();
+    },
+    methods: {
+      toEditDiscl(row){
+        this.$router.push({
+          name:'AddDisclInfo',
+          params: {info:row}
+        })
+      },
+      filterDatas(){
+        this.currentPage = 1;
+        this.getDataList();
+      },
+      getDataList() {
+        const param = this.getFilterItems();
+        api.discInformation(param).then((res) => {
+          if (res.data.code == '0') {
+            const data = res.data.data;
+            this.list = data.records;
+            this.cacheData[param.current] = data.records;
+            this.total = data.total;
+          }
+        }).catch((error) => {
+          console.log(error);
+        });
+      },
+      getDetail(item) {
+        this.$router.push({name:'DiscInfoDetail', params:{info: item}})
+      },
+      getFilterItems() {
+        const param = {
+          title: this.filter.title,
+          current: this.currentPage,
+          size: this.pageSize
+        };
+        return param;
+      },
+      indexMethod(index) {
+        return ((this.currentPage - 1) * this.pageSize) + index + 1;
+      },
+      currentChange(next) {
+        this.currentPage = next;
+        if (this.cacheData[next]) {       //如果已请求过该页数据,则使用缓存不重复请求
+          this.list = this.cacheData[next];
+        } else {
+          this.getDataList();
+        }
+      },
+      warning(msg,type){
+        this.$message({
+          showClose: true,
+          message:msg,
+          type:type||'warning'
+        })
+      },
+      showConfirmDialog(msg,resolve){
+        this.$alert(msg, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning'
+        }).then(() => {
+          resolve();
+        }).catch(() => {});
+      },
+      showDelDialog(id){
+        this.showConfirmDialog('是否删除该免责声明?',()=>{
+          api.delDiscInformation({id}).then((res)=>{
+            if(res.data.code=='0'){
+              this.warning(res.data.msg||'操作成功','success');
+              this.getDataList();
+            }else{
+              this.warning(res.data.msg);
+            }
+          }).catch((error)=>{
+            this.warning(error);
+          })
+        });
+      },
+      toOpen(item){
+        // status=0停用,status=1启用
+        if(item.status==0){
+          this.showConfirmDialog('是否启用该免责声明?',()=>{
+            api.openInformation({id:item.id}).then((res)=>{
+              if(res.data.code==0){
+                this.$message({
+                  type:'success',
+                  message:res.data.msg ||"启用成功"
+                })
+                this.getDataList();
+              }
+            }).catch((error)=>{
+              this.warning(error);
+            })
+          });
+        }
+      },
+      toClose(item){
+        if(item.status==1){
+          this.showConfirmDialog('是否停用该免责声明?',()=>{
+            api.closeInformation({id:item.id}).then((res)=>{
+              if(res.data.code==0){
+                this.$message({
+                  type:'success',
+                  message:res.data.msg ||"停用成功"
+                })
+                this.getDataList();
+              }
+            }).catch((error)=>{
+              this.warning(error);
+            })
+          });
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+    @import "../../less/admin.less";
+    .delete{
+      color: red !important;
+    }
+    .forbid{
+      color: #BFBFBF !important;
+    }
+</style>

+ 12 - 4
src/components/icss/IndeptLabel.vue

@@ -62,9 +62,16 @@
                     </template>
                 </el-table-column>
             </el-table>
-
+          <el-pagination v-if="total>pageSize"
+                        :current-page.sync="currentPage"
+                        @current-change="currentChange"
+                        background
+                        :page-size="pageSize"
+                        layout="total,prev, pager, next, jumper"
+                        :total="total">
+            </el-pagination>
         </div>
-        <div class="pagination">
+        <!-- <div class="pagination"> 
             <el-pagination v-if="total>pageSize"
                         :current-page.sync="currentPage"
                         @current-change="currentChange"
@@ -73,7 +80,7 @@
                         layout="total,prev, pager, next, jumper"
                         :total="total">
             </el-pagination>
-        </div>
+        </div> -->
         
     </div>
 </template>
@@ -227,8 +234,9 @@
 
 
 <style lang="less">
+  @import "../../less/admin.less";
     .delete{
-        color: red
+        color: red;
     }
     .delete:hover {
         color: red;

+ 14 - 3
src/components/icss/LabelGroup.vue

@@ -62,8 +62,6 @@
                     </template>
                 </el-table-column>
             </el-table>
-
-        </div>
         <div class="pagination">
             <el-pagination v-if="total>pageSize"
                        :current-page.sync="currentPage"
@@ -75,6 +73,18 @@
             </el-pagination>
         </div>
         
+        </div>
+       <!--  <div class="pagination">
+           <el-pagination v-if="total>pageSize"
+                      :current-page.sync="currentPage"
+                      @current-change="currentChange"
+                      background
+                      :page-size="pageSize"
+                      layout="total,prev, pager, next, jumper"
+                      :total="total">
+           </el-pagination>
+       </div> -->
+        
     </div>
 </template>
 
@@ -225,8 +235,9 @@ export default {
 
 
 <style lang="less">
+    @import "../../less/admin.less";
     .delete{
-       color: red
+       color: red;
     }
     .delete:hover {
         color: red;

+ 1 - 1
src/components/icss/PromptInfo.vue

@@ -52,7 +52,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" class="delete" @click="showDelDialog(scope.row.id)">删除</el-button>
                     </template>
                 </el-table-column>
                 <el-table-column

+ 3 - 8
src/components/icss/SimilarName.vue

@@ -232,21 +232,16 @@
   }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
     @import "../../less/admin.less";
-    .status-span{
-        font-size: 12px;
-        margin-right:10px;
-        color: unset;
-    }
     .delete{
-        color: red
+        color: red;
     }
     .el-table .cell{
       overflow: hidden;
       white-space: nowrap;
     }
     #upFile{
-      display: none;
+      display: none !important;
     }
 </style>

+ 3 - 0
src/less/admin.less

@@ -160,4 +160,7 @@
 .el-message {
   top: 10%;
   transform: translateY(-50%, -50%, 0);
+}
+.el-pagination{
+  min-width: 980px;
 }

+ 8 - 2
src/routes.js

@@ -40,6 +40,9 @@ import PromptInfo from '@components/icss/PromptInfo.vue'//提示信息
 import AddPromptInfo from '@components/icss/AddPromptInfo.vue'//添加提示信息
 import SimilarName from '@components/icss/SimilarName.vue'//别名维护
 import AddSimilarName from '@components/icss/AddSimilarName.vue'//别名维护-详情
+import DisclaimerInformation from '@components/icss/DisclaimerInformation.vue'//免责声明
+import DiscInfoDetail from '@components/icss/DiscInfoDetail.vue'//免责声明-详情
+import AddDisclInfo from '@components/icss/AddDisclInfo.vue'//免责声明-添加
 export default [
   {
     path: '/',
@@ -146,8 +149,11 @@ export default [
       {path:'LT-YXSJWH-TJDLBQ',component:AddIndeptLabel,name:'AddIndeptLabel'},     //独立标签维护--添加
       {path:'LT-YXSJWH-TSXXWH',component:PromptInfo,name:'PromptInfo'},         //提示信息维护
       {path:'LT-YXSJWH-TJTSXX',component:AddPromptInfo,name:'AddPromptInfo'},         //提示信息维护
-	  {path:'LT-YXSJWH-BMWH',component:SimilarName,name:'SimilarName'},     //别名维护
-      {path:'LT-YXSJWH-TJBM',component:AddSimilarName,name:'AddSimilarName'},     //别名维护-详情
+	    {path:'LT-YXSJWH-BMWH',component:SimilarName,name:'SimilarName'},     //别名维护
+      {path:'LT-YXSJWH-TJBM',component:AddSimilarName,name:'AddSimilarName'},     //别名维护-添加/修改
+      {path:'LT-YXSJWH-MZSMWH',component:DisclaimerInformation,name:'DisclaimerInformation'},     //免责声明
+      {path:'LT-YXSJWH-MZSMXQ',component:DiscInfoDetail,name:'DiscInfoDetail'},     //免责声明-详情
+      {path:'LT-YXSJWH-TJMZSM',component:AddDisclInfo,name:'AddDisclInfo'},     //免责声明-添加/修改
     ]
   }
 ]