Pārlūkot izejas kodu

合并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/api/utils.js
# src/components/icss/AddDisclInfo.vue
# src/components/icss/BloodPressTagGroup.vue
# src/components/icss/IndeptLabel.vue
# src/components/icss/LabelGroup.vue
# src/components/icss/NoiseTemplate.vue
# src/components/icss/PubTagGroup.vue
# src/components/icss/SymptomPush.vue
# src/components/icss/SymptomTagGroup.vue
# src/routes.js

liucf 6 gadi atpakaļ
vecāks
revīzija
78113af6ca

+ 20 - 4
src/api/config.js

@@ -98,7 +98,7 @@ export default {
     'getPromptList':'api/icssman/introduceInfo/getIntroducePage',//提示信息列表
     'addPromptInfo':'api/icssman/introduceInfo/saveIntroduce',//新增提示信息
     'delPromptInfo':'api/icssman/introduceInfo/deleteRecord',//删除提示信息
-    'PromptInfoDetail':'api/icssman/introduceDetail/getByIntroduceId',//提示信息详情
+    'PromptInfoDetail':'api/icssman/introduceInfo/getIntroduceById',//提示信息详情
     'getIcssEnumsData':'api/icssman/getIcssEnumsData',//icss枚举
 	  'similarName': 'api/icssman/retrieval/retrievalList', //别名维护
     'delSimilarName': 'api/icssman/retrieval/delRetrievalsByQuesId', //别名维护-删除
@@ -106,13 +106,29 @@ export default {
     'addSimilarName': 'api/icssman/retrieval/addTagRetrieval', //别名维护-添加、修改
     'searchLable': 'api/icssman/questionInfo/index', //标签检索
     'uploadFile': 'api/icssman/retrieval/retrievalExcelIm', //别名维护-导入
+    'commonSymptomList': 'api/icssman/questionUsual/getDeptInfos', //常见症状维护-常见症状列表
+    'getDepartmentList':'api/icssman/questionUsual/getDeptName', //常见症状维护-科室列表
+    'getSymptomList':'api/icssman/questionUsual/getQuestionInfo', //常见科室症状维护--获取症状列表
+    'addCommonSymptom': 'api/icssman/questionUsual/addQuestionUsual',  //常见科室症状维护--添加科室症状
+    'getCommonSymptomById': 'api/icssman/questionUsual/getQuestionUsualByDept', //常见科室症状维护--修改、详情
+    'delCommonSymptom': 'api/icssman/questionUsual/deleteQuestionUsual',  //常见科室症状维护--删除科室症状
     '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', //免责声明-启用
-    'versionInfo': 'api/icssman/versionInfo/getVersionInfoAlls', //版本信息
+    'updateModuleInfo': 'api/icssman/moduleInfo/updateModuleInfo', //模板维护系统修改保存
+    'getModuleInfoList': 'api/icssman/moduleInfo/getModuleInfoList', //模板维护系统列表
+    'getModuleInfoOne': 'api/icssman/moduleInfo/getModuleInfoOne', //模板维护系统修改获取单个模板信息
+    'delTemplate': 'api/icssman/moduleInfo/delete', //模板维护系统删除单个模板信息
+    'getPhysicalExamTempList': 'api/icssman/deptVital/getDeptVitalPage', //查体模板列表
+    'getPhysicalExamTempDepartList':'api/icssman/deptVital/getDeptShortList_create' , //查体模板科室列表--新增
+    'getPhysicalExamTempByDepId':'api/icssman/deptVital/getModuleByDeptId', //通过科室id获取查体模板
+    'savePhysicalExamTemp':'api/icssman/deptVital/saveDeptVitals',//保存查体模板
+    'delPhysicalExamTemp':'api/icssman/deptVital/delAllDeptVitalList',//删除查体模板
+    'getAllConcept':'/api/knowledgeman/concept/getAllConcept', //  术语列表
+	'versionInfo': 'api/icssman/versionInfo/getVersionInfoAlls', //版本信息
     'addVersInfo': 'api/icssman/versionInfo/saveVersionInfoAlls', //版本信息-添加
     'updateVersInfo': 'api/icssman/versionInfo/updateVersionInfoAlls', //版本信息-修改
     'delVersionInfo': 'api/icssman/versionDetail/cancelVersionDetails', //版本信息-删除版本说明
@@ -142,8 +158,8 @@ export default {
   groupParams:[
     {controlType:[1,2],tagType:[1],notTagType:[8]},     //多列多选(杂音/初为)     notTagType为文字标签剔除
     {controlType:[1,2,6,7],tagType:[1,2],notTagType:[8]},  //多项统一横铺标签(血压)
-    {controlType:[1,2,6,7],tagType:[1,2],notTagType:[8]},  //症状详细(症状尾巴)
-    {controlType:[1,2],tagType:[1,2,3,4,10],notTagType:[8]}, //组合项标签(既往史)
+    {controlType:[1,2,5,6,7],tagType:[1,2],notTagType:[8]},  //症状详细(症状尾巴)
+    {controlType:[0,2],tagType:[1,4],notTagType:[8]}, //组合项标签(既往史)
     {controlType:[1,6],tagType:[],notTagType:[8]},    //化验组合
     {controlType:[1,2,99],tagType:[],notTagType:[8]},   //症状推送类型(添加症状)
   ]

+ 53 - 2
src/api/icss.js

@@ -22,6 +22,12 @@ export default {
     PromptInfoDetail(param){
         return axios.post(urls.PromptInfoDetail,param)
     },
+    getPrompDetail(param){
+      return axios.post(urls.PromptInfoDetail,param);
+    },
+    getTremList(param){
+      return axios.post(urls.getAllConcept,param);
+    },
     getTagList(param) {
         return axios.post(urls.getTagList, param)
     },
@@ -53,7 +59,10 @@ export default {
         return axios.post(urls.modifDeptInfo, param)
     },
     saveOrUpdate(param) {
-        return axios.post(urls.saveOrUpdate, param)
+        return axios.post(urls.saveOrUpdate, param);
+    },
+    savePrompts(param){
+      return axios.post(urls.addPromptInfo, param);
     },
     deleteTagGroup(param) {
         return axios.post(urls.deleteTagGroup, param)
@@ -93,6 +102,21 @@ export default {
     uploadFile(param) {//别名维护-导入
         return axios.post(urls.uploadFile, param)
     },
+    commonSymptomList(param) {  //常见症状维护-常见症状列表
+        return axios.post(urls.commonSymptomList, param)
+    },
+    getDepartmentList() {   //常见症状维护-获取科室列表
+        return axios.post(urls.getDepartmentList)
+    },
+    getSymptomList(param) {
+        return axios.post(urls.getSymptomList, param)
+    },
+    addCommonSymptom(param) {
+        return axios.post(urls.addCommonSymptom, param)
+    },
+    delCommonSymptom(param) {
+        return axios.post(urls.delCommonSymptom, param)
+    },
     discInformation(param) {//免责声明
         return axios.post(urls.discInformation, param)
     },
@@ -111,7 +135,34 @@ export default {
     openInformation(param) {//免责声明-停用
         return axios.post(urls.openInformation, param)
     },
-    versionInfo(param) {//版本信息
+    updateModuleInfo(param) {//模板维护系统修改保存
+        return axios.post(urls.updateModuleInfo, param)
+    },
+    getModuleInfoList(param) {//模板维护系统列表
+        return axios.post(urls.getModuleInfoList, param)
+    },
+    getModuleInfoOne(param) {//模板维护系统修改获取单个模板信息
+        return axios.post(urls.getModuleInfoOne, param)
+    },
+    delTemplate(param) {//模板维护系统删除单个模板信息
+        return axios.post(urls.delTemplate, param)
+    },
+    getPhysicalExamTempList(param) {
+        return axios.post(urls.getPhysicalExamTempList, param)
+    },
+    getPhysicalExamTempDepartList() {
+        return axios.post(urls.getPhysicalExamTempDepartList)
+    },
+    getPhysicalExamTempByDepId(param) {
+        return axios.post(urls.getPhysicalExamTempByDepId, param)
+    },
+    savePhysicalExamTemp(param) {
+        return axios.post(urls.savePhysicalExamTemp, param)
+    },
+    delPhysicalExamTemp(param) {
+        return axios.post(urls.delPhysicalExamTemp, param)
+    },
+ 	versionInfo(param) {//版本信息
         return axios.post(urls.versionInfo, param)
     },
     addVersInfo(param) {//版本信息-添加

+ 9 - 6
src/api/utils.js

@@ -155,8 +155,9 @@ export default {
   simpleOptionData(data){
     let arr = data.map((it,i)=>{
       let code = '';
-      if(it.isCorrect){
-        code = '3';
+      let abnormal = 0
+      if(it.isError){
+        abnormal = 1;
       }
       if(it.isNone){
         code = '2';
@@ -164,7 +165,7 @@ export default {
       if(it.isBan){
         code = '1';
       }
-      return {name:it.name,defaultSelect:it.defaultSelect?'1':'0',code,remark:'单选项-'+it.name}
+      return {name:it.name,defaultSelect:it.defaultSelect?'1':'0',code,abnormal,remark:'单选项-'+it.name}
     });
     return arr;
   },
@@ -172,10 +173,10 @@ export default {
    *将提交的参数转换成对应的组件form中的key
    *
    */
-  transformKeys(data, tagFlag){   //tagFlag:独立标签还是标签组 ()
+  transformKeys(data, tagFlag){   //tagFlag:独立标签还是标签组 (2是标签组)
     const maps = {
       "controlType": 'region2',                            //控件类型(0:默认值 1:下拉单选 2:下拉多选 6:文本框 7:数字键盘文本框 99:联合推送)
-      "tagType": 'region2',              //标签类型
+      // "tagType": 'region2',(这个注释掉,不要解开了!!!!)
       "id": "id",                                    //新增id置空
       "type": 'region1',                //标签归属
       "tagName": 'region3',             //系统名称
@@ -185,12 +186,14 @@ export default {
       "sexType": 'region7',             //1:男,2:女,3:通用
       "ageBegin": 'region8',       		 //最小年龄
       "ageEnd": 'region9',              //最大年龄
+      "copyType":'region10',          //是否复制主标签  
+      "showAdd":'region11',           //是否复制当前模块
       "labelPrefix":'prefix',                                 //前缀
       "labelSuffix":'suffix',                                 //后缀
       "maxValue":'maxNormalVal',                                 //前缀
       "minValue":'minNormalVal'                                 //后缀
     };
-    if (tagFlag) {
+    if (tagFlag == 2) {
       maps["tagType"] = 'region2'
     }
     let obj = {};

+ 392 - 0
src/components/icss/AddCommonSymptom.vue

@@ -0,0 +1,392 @@
+<!-- 添加常见科室症状  -->
+<template>
+    <div class="addCommonSymptomWrapper">
+        <div class="groupTitle"><i
+            class="el-icon-back"
+            @click="back"
+        ></i> 常见症状维护系统--添加科室常见症状</div>
+        <el-form :model="form" ref="ruleForm" :rules="rules" class="addDepartForm">
+            <el-form-item label="选择科室" prop="department">
+                <el-select 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 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-select>
+            </el-form-item>
+        </el-form>
+        <div class="symptomList">
+            <div class="bottomPartLeft fl">
+                
+                <p class="symptomPoolTitle">症状池</p>
+                <div class="symptomPool">
+                    <el-input
+                    placeholder="请输入搜索内容"
+                    v-model="searchVal"
+                    >
+                        <i
+                            slot="prefix"
+                            class="el-input__icon el-icon-search"
+                        ></i>
+                    </el-input>
+                    <ul class="tagList tagPool">
+                        <li v-for="(item, index) in leftTagsList"
+                            class = "tagItem"
+                            :key='item.id'
+                            :title="'[ '+item.tagName+' ]'"
+                            :style="getStyle(item)?styles:null"
+                            @click='selectLeftTag(item, index)'
+                        >
+                            <p class="tagName ellipsis" >{{item.tagName}} </p>
+                        </li>
+                    </ul>
+                </div>
+
+            </div>
+            <div class="bottomPartMid fl">
+                <p><span class="el-icon-arrow-right" @click="toRightList"></span></p>
+                <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
+            </div>
+            <div class="bottomPartRight fl">
+                <p class="symptomPoolTitle">常见症状:</p>
+                <ul class="tagList operationPool">
+                        <li class = "tagItem"
+                            v-for="(item,index) in rightTagsList" 
+                            :key='item.id'
+                            :style="index === selectRightTagIndex?styles:null"
+                            @click='selectRightTag(index)'
+                        >   
+                            <p v-if="item.tagName" class="tagName  ellipsis" :title="'[ '+item.tagName+' ]'">{{item.tagName}} </p>
+                        </li>
+                    </ul>
+
+            </div>
+            <div class="bottomPartMid fl">
+                <p><span class="el-icon-arrow-up" @click="toUp"></span></p>
+                <p><span class="el-icon-arrow-down" @click="toDown"></span></p>
+            </div>
+            
+        </div>
+        <div class="btn">
+            <el-button
+            type="primary"
+            @click="submitForm('ruleForm')"
+            >确 定</el-button>
+        </div>
+    </div>
+    
+</template>
+
+<script>
+  import api from '@api/icss.js';
+  export default {
+    name: 'AddCommonSymptom',
+    data() {
+        return{
+            rules: {
+                department:[{required: true, message: '请选择科室', trigger: ['blur']}],
+                type:[{required: true, message: '请选择科室', trigger: ['blur']}]
+            },
+            form: {
+                department: '',
+                type:''
+            },
+            departList: [],
+            typeList:[],
+            searchVal: '',
+            leftTagsList:[],
+            rightTagsList:[],
+            selectLeftTagsList: [],
+            selectRightTagIndex: -1,
+            styles:{
+                background:'#eae7e7'
+            },
+        }
+    },
+    created(){
+        const { isEdit, isDetail, data } = this.$route.params;
+        if(isEdit || isDetail) {
+            this.isEdit = isEdit
+            
+        } else {
+            this.getDepartmentList()
+        }
+    },
+    watch: {
+        searchVal(newVal, preVal) {
+            if(newVal.trim() == ''){
+                this.getSymptomList()
+            }else if(newVal.trim() != preVal.trim()){
+                this.getSymptomList()
+            }
+        }
+    },
+    methods: {
+        back(){
+            this.$router.go(-1);
+        },
+        getDepartmentList() {
+            api.getDepartmentList().then((res)=>{
+               if(res.data.code === '0') {
+                   this.departList = res.data.data
+                }
+            })
+        },
+        getSymptomList() {
+            let noIds = []
+            for (let i =0; i < this.rightTagsList.length; i++) {
+                noIds.push(this.rightTagsList[i].id)
+            }
+            const param = {
+                "deptId": this.form.department,
+                "tagName": this.searchVal,
+                "noIds": noIds,
+                "type": this.form.type
+            }
+            api.getSymptomList(param).then((res)=>{
+               if(res.data.code === '0') {
+                   this.leftTagsList = res.data.data
+                }
+            })
+        },
+        changeDept() {
+            console.log('asdasfdgag',this.departList)
+            this.form.type = ''
+            this.typeList = this.departList.filter(item => this.form.department == item.id)[0].typeDTOList
+            this.clearData()
+        },
+        changeType() {
+            this.clearData()
+            this.getSymptomList()
+        },
+        clearData() {
+            this.leftTagsList = [];
+            this.rightTagsList = [];
+            this.selectLeftTagsList = [];
+            this.selectRightTagIndex = -1;
+        },
+        selectLeftTag(tag, index, e) {
+            const hasTag = this.isHasTag(tag, this.selectLeftTagsList)
+            if (hasTag) {
+                this.selectLeftTagsList = this.selectLeftTagsList.filter(item => item.id !== tag.id)
+            } else {
+                this.selectLeftTagsList.push(tag);
+            }
+        },
+        selectRightTag(index) {
+            this.selectRightTagIndex = this.selectRightTagIndex === index ? -1 : index
+        },
+        toRightList(){
+            this.rightTagsList.push(...this.selectLeftTagsList);
+            this.selectLeftTagsList = [];
+            this.selectRightTagsList = [];
+            this.getSymptomList()
+        },
+        toLeftList(){
+            for(let i = 0; i < this.selectRightTagsList.length; i++) {
+                this.rightTagsList = this.rightTagsList.filter(item => item.id !== this.selectRightTagsList[i].id)
+            }
+            this.selectLeftTagsList = [];
+            this.selectRightTagsList = [];
+            this.getSymptomList()
+
+        },
+        toUp(){
+            if(this.selectRightTagIndex === 0 || this.selectRightTagIndex === -1) {
+                return
+            }
+            const tempItem = this.rightTagsList[this.selectRightTagIndex]
+            this.rightTagsList.splice(this.selectRightTagIndex, 1)
+            this.rightTagsList.splice(this.selectRightTagIndex-1, 0,tempItem)
+            this.selectRightTagIndex = -1
+        },
+        toDown(){
+             if(this.selectRightTagIndex === this.rightTagsList.length-1 || this.selectRightTagIndex === -1) {
+                return
+            }
+            const tempItem = this.rightTagsList[this.selectRightTagIndex]
+            this.rightTagsList.splice(this.selectRightTagIndex, 1)
+            this.rightTagsList.splice(this.selectRightTagIndex+1, 0,tempItem)
+            this.selectRightTagIndex = -1
+
+        },
+
+        isHasTag(item, arr) {
+            for ( let i = 0; i <arr.length; i++) {
+                if(arr[i].id === item.id) {
+                    return true;
+                }
+            }
+            return false;
+        },
+        getStyle(item){       //左侧选中状态
+            return this.isHasTag(item, this.selectLeftTagsList)
+        },
+        getStyle2(item) {
+            return this.isHasTag(item, this.selectRightTagsList)
+        },
+        submitForm(formName) {
+           
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    return
+                } else {
+                    console.log('error submit!!');
+                    return false;
+                }
+            });
+             if(!this.form.department) {
+                return 
+            }
+            this.showDelDialog()
+        },
+        showDelDialog() {
+            let questionId = []
+            for (let i =0; i < this.rightTagsList.length; i++) {
+                questionId.push(this.rightTagsList[i].id)
+            }
+            const param ={
+                "deptId": this.form.department,
+                "questionId": questionId
+   
+            }
+            this.showConfirmDialog('是否保存该标签组?', () => {
+                api.addCommonSymptom(param).then((res) => {
+                if (res.data.code  === '0') {
+                    this.warning(res.data.msg || '保存成功', 'success','1000')
+                    setTimeout(() => {
+                    this.$router.push({
+                        path:'/admin/LT-YXSJWH-CJZZWH'
+                    })
+                    }, 1000);
+                } else {
+                    this.warning(res.data.msg)
+                }
+                }).catch((err) => {
+                    this.warning(err);
+                })
+            });
+        },
+        showConfirmDialog(msg, resolve) {
+            this.$alert(msg, '提示', {
+                confirmButtonText: '确定',
+                type: 'warning'
+            }).then(() => {
+                resolve();
+            }).catch(() => {});
+        },
+        warning(msg, type,time) {
+            this.$message({
+                showClose: true,
+                message: msg,
+                type: type || 'warning',
+                duration:time || '3000'
+            })
+        },
+    }
+  }
+</script>
+
+<style lang="less">
+    @import '../../less/common.less';
+    .addCommonSymptomWrapper {
+        .groupTitle {
+            background-color: #fff;
+            height: 40px;
+            line-height: 40px;
+            padding-left: 20px;
+        }
+        .addDepartForm {
+            background-color: #fff;
+            padding: 20px;
+            margin: 20px 20px 0px 20px;
+        }
+        .symptomList {
+            background-color: #fff;
+             padding: 20px;
+             margin: 20px 20px 0px 20px;
+             height: 500px;
+        }
+        .bottomPartLeft {
+            width: 32%;
+        }
+        .symptomPoolTitle {
+            height: 40px;
+            line-height: 40px;
+        }
+        .symptomPool {
+            width: 100%;
+        }
+        .tagList {
+            width: 100%;
+            height: 300px;
+            border: 1px solid @icssBorder;
+            box-sizing: border-box;
+        }
+        .tagList {
+        border: 1px solid @icssBorder;
+        }
+        .tagPool {
+            height: 300px;
+            overflow-y: auto;
+
+        }
+        .tagItem {
+            position: relative;
+            line-height: 30px;
+            cursor: pointer;
+            padding: 0 10px;
+        }
+        .tagName:before {
+            content: '['
+        }
+        .tagName::after {
+            content: ']'
+        }
+        .bottomPartMid {
+            width: 8%;
+            margin-top: 60px;
+            p {
+            width: 100%;
+            text-align: center;
+            span {
+                cursor: pointer;
+                display: inline-block;
+                width: 30px;
+                height: 40px;
+                line-height: 40px;
+                margin: 0 auto;
+                border: 1px solid @icssBorder;
+                margin-bottom: 15px;
+                font-size: 18px;
+            }
+            }
+        }
+        .bottomPartRight {
+            width: 32%;
+        }
+        .operationPool {
+            position: relative;
+            width: 100%;
+            height: 340px;
+            padding: 10px 0;
+        }
+        .btn {
+            position: relative;
+            background-color: #fff;
+            margin: 0px 20px;
+            padding: 20px;
+            .el-button {
+                position: absolute;
+                right: 20px;
+                top: -20px;
+            }
+        }
+        .selectDepart {
+            
+        }
+    }
+    
+</style>

+ 4 - 2
src/components/icss/AddIndeptLabel.vue

@@ -3,7 +3,7 @@
         <div class="groupTitle"><i
                 class="el-icon-back"
                 @click="back"
-        ></i> 独立标签维护--添加独立标签</div>
+        ></i> {{txt}}</div>
         <PubIndeptTag
                 @changeVal="changeVal"
                 @changeSex="changeSex"
@@ -13,7 +13,7 @@
                 ref="submitForm"
         ></PubIndeptTag>
         <div class="main">
-            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2||dataPub.region2==99"> <i>*</i> 标签明细:</p>
+            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2"> <i>*</i> 标签明细:</p>
             <SingleSelect v-if="dataPub.region2==1 || dataPub.region2==2" :ascription="dataPub.region1" :sexType="dataPub.region7" :type="dataPub.region2" @pushValues="pushValues" :options="editData.questionDetailList"></SingleSelect>
             <div class="btn">
                 <el-button
@@ -37,6 +37,7 @@
     name: 'NoiseTemplateWrapper',
     data() {
       return {
+        txt:'独立标签维护--添加独立标签',
         dataPub: {},      //公用组件传的值都在这
         itemsTypes:[1,2],            //有明细的类型
         editData:{},                    //编辑数据
@@ -54,6 +55,7 @@
     beforeMount:function(){
       const {isEdit,data} = this.$route.params;
       if(isEdit){
+        this.txt = '独立标签维护--修改独立标签'
         this.editData = data;
       }
     },

+ 229 - 0
src/components/icss/AddMedicinePrompt.vue

@@ -0,0 +1,229 @@
+<template>
+    <div class="NoiseTemplateWrapper TemplateWrapper">
+        <div class="groupTitle"><i
+                class="el-icon-back"
+                @click="back"
+        ></i> 医学静态知识--{{isEdit?'修改':'添加'}}</div>
+        <div class="info-container">
+            <el-form :rules="rules"
+                     :model="form"
+                     label-width="130px"
+                     ref="groups">
+                <el-form-item label="选择术语标签:" prop="name">
+                    <el-select v-model="form.selectedTerm" :disabled="isEdit">
+                        <el-option v-for="term in terms" v-key="term.id" :value="term.id">{{term.name}}</el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="已选择术语标签:">
+                    {{form.selectedTermName}}
+                </el-form-item>
+                <InfoParagraph v-for="(f,i) in form.prags"
+                               :data="f"
+                               :index="i"
+                               :isEdit = "isEdit"
+                               @change="getPgValues"
+                               @add="addParagraph"
+                               @del="delParagraph" ref="subForm"></InfoParagraph>
+            </el-form>
+            <div class="btn">
+                <el-button
+                        type="primary"
+                        @click="submitForm"
+                >确 定</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+  /**
+   *
+   */
+  import api from '@api/icss.js';
+  import utils from '@api/utils.js';
+  import TagPool from './PromptTagPool';
+  import schema from 'async-validator';
+  import InfoParagraph from './InfoParagraph';
+
+  export default {
+    name: 'AddPromptInfo',
+    components: {
+      TagPool,
+      InfoParagraph
+    },
+    data() {
+      return {
+        isEdit:false,
+        terms:[],              //术语列表
+        editData:{
+          selectedTerm:'',
+          prags:[]
+        },
+        form:{
+          name:'',
+          selectedTerm:'',            //术语标签
+          selectedTermName:'',
+          prags:[{              //单个段落相关
+            title:'',
+            content:'',
+            isReason:0,
+            orderNo:0,
+            position:[],
+            text:''}]
+        },
+        rules: {
+          name: [
+            { required: true, message: '请选择术语标签', trigger: 'change' }
+          ]
+        }
+      }
+    },
+    created:function(){
+      const {isEdit,data} = this.$route.params;
+      if(isEdit){
+        this.isEdit = isEdit;
+      }
+    },
+    searchTerms(){
+      //搜索术语列表
+      api.getTremList().then((res) =>{
+        if(res.data.code === '0') {
+          this.terms = res.data.data;
+        }else{
+          this.warning("数据获取失败");
+        }
+      })
+    },
+    methods: {
+      back() { this.$router.go(-1) },
+      mapStringToNum(str){
+        return str.split(",").map((it)=>{
+          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;
+        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;
+            }
+          });
+        };
+
+        if(!goOn){
+          return;
+        }
+        //通过必填验证,提交保存
+        const param = {
+          name:this.form.name,
+          detailVOList:Object.assign(this.form.prags),
+          mapVOList:Object.assign(this.form.selectedTags)
+        };
+        //console.log(param);
+        this.showSaveDialog(param);
+      },
+      parseTagsForSubmit(data){
+        return data.map((it)=>{
+          return {questionId:it.id,introduceId:'',type:it.type};
+        });
+      },
+      changeActionData(selectedTags){
+        this.form.selectedTags = this.parseTagsForSubmit(selectedTags);
+        //console.log(selectedTags)
+      },
+      showSaveDialog(param) {
+        this.showConfirmDialog('是否保存该静态知识?', () => {
+          api.savePrompts(param).then((res) => {
+            if (res.data.code === '0') {
+              this.warning(res.data.msg || '保存成功', 'success');
+              this.$router.push("/admin/LT-YXSJWH-TSXXWH");
+            } else {
+              this.warning(res.data.msg)
+            }
+          }).catch((err) => {
+            this.warning(err);
+          })
+        });
+      },
+      showConfirmDialog(msg, resolve) {
+        this.$alert(msg, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning'
+        }).then(() => {
+          resolve();
+        }).catch(() => {});
+      },
+      warning(msg, type) {
+        this.$message({
+          showClose: true,
+          message: msg,
+          type: type || 'warning'
+        })
+      },
+    }
+  }
+</script>
+<style lang="less">
+    @import "../../less/common.less";
+    .info-container{
+        background: #fff;
+        padding: 20px;
+        margin: 20px 20px -20px 20px;
+    .el-input__inner{
+        width: 200px;
+    }
+    .el-form-item__label{
+        text-align: left;
+    }
+    .add-prg .el-form-item{
+        margin-bottom: 20px;
+    }
+    }
+    .line{
+        border-top:1px #dcdfe6 solid;
+        margin-bottom: 25px;
+    }
+</style>
+

+ 403 - 0
src/components/icss/AddPhysicalExamTemp.vue

@@ -0,0 +1,403 @@
+<!-- 添加常见科室症状  -->
+<template>
+    <div class="AddPhysicalExamTempWrapper">
+        <div class="groupTitle"><i
+            class="el-icon-back"
+            @click="back"
+        ></i> 查体模板维护系统--添加模板</div>
+        <el-form :model="form" ref="ruleForm" :rules="rules" class="addDepartForm">
+            <el-form-item label="模板归属:"  >
+               <span>查体</span>
+            </el-form-item>
+            <el-form-item label="选择科室" prop="department">
+                <el-select :disabled="isEdit || isDetail" v-model="form.department" placeholder="请添加科室" @change="changeDepart" 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>
+        <div class="symptomList">
+            <div class="bottomPartLeft fl" v-if="!isDetail">
+                
+                <p class="symptomPoolTitle">标签池</p>
+                <div class="symptomPool">
+                    <el-input
+                    placeholder="请输入搜索内容"
+                    v-model="searchVal"
+                    >
+                        <i
+                            slot="prefix"
+                            class="el-input__icon el-icon-search"
+                        ></i>
+                    </el-input>
+                    <ul class="tagList tagPool">
+                        <li v-for="(item, index) in leftTagsList"
+                            class = "tagItem"
+                            :key='item.id'
+                            :title="'[ '+item.tagName+' ]'"
+                            :style="getStyle(item)?styles:null"
+                            @click='selectLeftTag(item, index)'
+                        >
+                            <p class="tagName ellipsis" >{{item.tagName}} </p>
+                        </li>
+                    </ul>
+                </div>
+
+            </div>
+            <div class="bottomPartMid fl" v-if="!isDetail">
+                <p><span class="el-icon-arrow-right" @click="toRightList"></span></p>
+                <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
+            </div>
+            <div class="bottomPartRight fl">
+                <p class="symptomPoolTitle">查体模板: 
+                    <span class="el-icon-arrow-right arrowIcon" @click="toDown"></span>
+                    <span class="el-icon-arrow-left arrowIcon" @click="toUp"></span> 
+                </p>
+                <ul class="tagList operationPool">
+                        <li class = "tagItem fl"
+                            v-for="(item,index) in rightTagsList" 
+                            :key='item.id'
+                            :style="index === selectRightTagIndex?styles:null"
+                            @click='isDetail ? "" : selectRightTag(index)'
+                        >   
+                            <p v-if="item.tagName" class="tagName  ellipsis" :title="'[ '+item.tagName+' ]'">{{item.tagName}} </p>
+                        </li>
+                    </ul>
+
+            </div>
+           
+            
+        </div>
+        <div class="btn">
+            <el-button
+            type="primary"
+            @click="submitForm('ruleForm')"
+            >确 定</el-button>
+        </div>
+    </div>
+    
+</template>
+
+<script>
+  import api from '@api/icss.js';
+  export default {
+    name: 'AddPhysicalExamTempWrapper',
+    data() {
+        return{
+            rules: {
+                department:[{required: true, message: '请选择科室', trigger: ['blur', 'change']}],
+            },
+            form: {
+                department: '',
+            },
+            departList: [],
+            searchVal: '',
+            leftTagsList:[],
+            rightTagsList:[],
+            selectLeftTagsList: [],
+            isEdit: false, 
+            isDetail: false,
+            selectRightTagIndex: -1,
+            styles:{
+                background:'#eae7e7'
+            },
+        }
+    },
+    created(){
+        const { isEdit, isDetail, data } = this.$route.params;
+        if(isEdit || isDetail) {
+            const { id, name } = data
+            this.isEdit = isEdit
+            this.isDetail = isDetail
+            this.rightTagsList = data.vitals
+            this.departList.push({ id, name, val:id })
+            this.form.department = id
+            
+        }
+        this.getDepartmentList()
+        this.getTagList()
+    },
+    watch: {
+        searchVal(newVal, preVal) {
+            if(newVal.trim() == ''){
+                this.getTagList()
+            }else if(newVal.trim() != preVal.trim()){
+                this.getTagList()
+            }
+        }
+    },
+    methods: {
+        back(){
+            this.$router.go(-1);
+        },
+        getDepartmentList() {
+            api.getPhysicalExamTempDepartList().then((res)=>{
+               if(res.data.code === '0') {
+                   this.departList = res.data.data
+                   
+                }
+            })
+        },
+        getTagList() {
+                const notIds = this.getRightTagListIds()
+                let param = {
+                "tagName": this.searchVal,
+                "type": 4,
+                "notIds": notIds,
+            }
+            api.searchTagList(param).then((res) => {
+                if (res.data.code === '0') {
+                    this.leftTagsList = res.data.data
+                }
+            })
+            
+        },
+        getRightTagListIds() {
+            let RightTagListIds = []
+            for (let i =0; i < this.rightTagsList.length; i++) {
+                RightTagListIds.push(this.rightTagsList[i].id)
+            }
+            return RightTagListIds
+        },
+        changeDepart(){
+            console.log(this.form.department)
+            this.getTagList()
+        },
+        selectLeftTag(tag, index, e) {
+            const hasTag = this.isHasTag(tag, this.selectLeftTagsList)
+            if (hasTag) {
+                this.selectLeftTagsList = this.selectLeftTagsList.filter(item => item.id !== tag.id)
+            } else {
+                this.selectLeftTagsList.push(tag);
+            }
+        },
+        selectRightTag(index) {
+            this.selectRightTagIndex = this.selectRightTagIndex === index ? -1 : index
+        },
+        toRightList(){
+            this.rightTagsList.push(...this.selectLeftTagsList);
+            this.selectLeftTagsList = [];
+            this.selectRightTagsList = [];
+            this.getTagList()
+            console.log('rightTagsList', this.rightTagsList)
+        },
+        toLeftList(){
+            for(let i = 0; i < this.selectRightTagsList.length; i++) {
+                this.rightTagsList = this.rightTagsList.filter(item => item.id !== this.selectRightTagsList[i].id)
+            }
+            this.selectLeftTagsList = [];
+            this.selectRightTagsList = [];
+            this.getTagList()
+
+        },
+        toUp(){
+            if(this.selectRightTagIndex === 0 || this.selectRightTagIndex === -1) {
+                return
+            }
+            const tempItem = this.rightTagsList[this.selectRightTagIndex]
+            this.rightTagsList.splice(this.selectRightTagIndex, 1)
+            this.rightTagsList.splice(this.selectRightTagIndex-1, 0,tempItem)
+            this.selectRightTagIndex = -1
+        },
+        toDown(){
+             if(this.selectRightTagIndex === this.rightTagsList.length-1 || this.selectRightTagIndex === -1) {
+                return
+            }
+            const tempItem = this.rightTagsList[this.selectRightTagIndex]
+            this.rightTagsList.splice(this.selectRightTagIndex, 1)
+            this.rightTagsList.splice(this.selectRightTagIndex+1, 0,tempItem)
+            this.selectRightTagIndex = -1
+
+        },
+
+        isHasTag(item, arr) {
+            for ( let i = 0; i <arr.length; i++) {
+                if(arr[i].id === item.id) {
+                    return true;
+                }
+            }
+            return false;
+        },
+        getStyle(item){       //左侧选中状态
+            return this.isHasTag(item, this.selectLeftTagsList)
+        },
+        getStyle2(item) {
+            return this.isHasTag(item, this.selectRightTagsList)
+        },
+        submitForm(formName) {
+           
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    return
+                } else {
+                    console.log('error submit!!');
+                    return false;
+                }
+            });
+             if(!this.form.department) {
+                return 
+            }
+            this.showDelDialog()
+        },
+        showDelDialog() {
+            let dvDetailVOList = []
+            for (let i =0; i < this.rightTagsList.length; i++) {
+                dvDetailVOList.push({orderNo: i+1,vitalId:this.rightTagsList[i].id })
+            }
+            const param ={
+                "deptId": this.form.department,
+                "dvDetailVOList": dvDetailVOList
+   
+            }
+            this.showConfirmDialog('是否保存该模板?', () => {
+                api.savePhysicalExamTemp(param).then((res) => {
+                console.log('resssss', res)
+                if (res.data.code  === '0') {
+                    this.warning(res.data.msg || '保存成功', 'success','1000')
+                    setTimeout(() => {
+                    this.$router.push({
+                        path:'/admin/LT-YXSJWH-CTBQWH'
+                    })
+                    }, 1000);
+                } else {
+                    this.warning(res.data.msg)
+                }
+                }).catch((err) => {
+                    this.warning(err);
+                })
+            });
+        },
+        showConfirmDialog(msg, resolve) {
+            this.$alert(msg, '提示', {
+                confirmButtonText: '确定',
+                type: 'warning'
+            }).then(() => {
+                resolve();
+            }).catch(() => {});
+        },
+        warning(msg, type,time) {
+            this.$message({
+                showClose: true,
+                message: msg,
+                type: type || 'warning',
+                duration:time || '3000'
+            })
+        },
+    }
+  }
+</script>
+
+<style lang="less">
+    @import '../../less/common.less';
+    .AddPhysicalExamTempWrapper {
+        .groupTitle {
+            background-color: #fff;
+            height: 40px;
+            line-height: 40px;
+            padding-left: 20px;
+        }
+        .addDepartForm {
+            background-color: #fff;
+            padding: 20px;
+            margin: 20px 20px 0px 20px;
+        }
+        .symptomList {
+            background-color: #fff;
+             padding: 20px;
+             margin: 20px 20px 0px 20px;
+             height: 500px;
+        }
+        .bottomPartLeft {
+            width: 32%;
+        }
+        .symptomPoolTitle {
+            height: 40px;
+            line-height: 40px;
+        }
+        .symptomPool {
+            width: 100%;
+        }
+        .tagList {
+            width: 100%;
+            height: 300px;
+            border: 1px solid @icssBorder;
+            box-sizing: border-box;
+        }
+        .tagList {
+        border: 1px solid @icssBorder;
+        }
+        .tagPool {
+            height: 300px;
+            overflow-y: auto;
+
+        }
+        .tagItem {
+            position: relative;
+            line-height: 30px;
+            cursor: pointer;
+            padding: 0 10px;
+        }
+        .tagName:before {
+            content: '['
+        }
+        .tagName::after {
+            content: ']'
+        }
+        .bottomPartMid {
+            width: 8%;
+            margin-top: 60px;
+            p {
+            width: 100%;
+            text-align: center;
+            span {
+                cursor: pointer;
+                display: inline-block;
+                width: 30px;
+                height: 40px;
+                line-height: 40px;
+                margin: 0 auto;
+                border: 1px solid @icssBorder;
+                margin-bottom: 15px;
+                font-size: 18px;
+            }
+            }
+        }
+        .arrowIcon {
+             cursor: pointer;
+            display: inline-block;
+            width: 40px;
+            height: 30px;
+            line-height: 30px;
+            border: 1px solid @icssBorder;
+            font-size: 18px;
+            text-align: center;
+            margin-right: 15px;
+            .fr
+
+        }
+        .bottomPartRight {
+            width: 52%;
+        }
+        .operationPool {
+            position: relative;
+            width: 100%;
+            height: 340px;
+            padding: 10px 0;
+            overflow: auto;
+        }
+        .btn {
+            position: relative;
+            background-color: #fff;
+            margin: 0px 20px;
+            padding: 20px;
+            .el-button {
+                position: absolute;
+                right: 20px;
+                top: -20px;
+            }
+        }
+        .selectDepart {
+            
+        }
+    }
+    
+</style>

+ 141 - 82
src/components/icss/AddPromptInfo.vue

@@ -3,44 +3,34 @@
         <div class="groupTitle"><i
                 class="el-icon-back"
                 @click="back"
-        ></i> 提示信息维护--添加</div>
+        ></i> 提示信息维护--{{isEdit?'修改':'添加'}}</div>
         <div class="info-container">
             <el-form :rules="rules"
                      :model="form"
                      label-width="130px"
                      ref="groups">
                 <el-form-item label="静态知识名称:" prop="name">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.name" :disabled="isEdit"></el-input>
                 </el-form-item>
+                <InfoParagraph v-for="(f,i) in form.prags"
+                               :data="f"
+                               :index="i"
+                               :isEdit = "isEdit"
+                               @change="getPgValues"
+                               @add="addParagraph"
+                               @del="delParagraph" ref="subForm"></InfoParagraph>
                 <p class="line"></p>
-                <el-form-item label="是否属于诊断:" prop="isReason">
-                    <el-select v-model="form.isReason" placeholder="请选择">
-                        <el-option label="否" value="0"></el-option>
-                        <el-option label="是" value="1"></el-option>
-                    </el-select>
+                <el-form-item label="关联标签:" prop="tags">
+                    <el-form-item label="标签归属:">
+                        <el-select placeholder="标签归属" v-model="form.tagFor" clearable>
+                            <el-option v-for="item in Adscriptions" :label="item.name" :value="item.val" :key="item.id" ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <TagPool :pool="tagPool"
+                             :type="form.tagFor"
+                             :selected="editData.selectedTags"
+                             @changeActionData="changeActionData"></TagPool>
                 </el-form-item>
-                <el-form-item label="显示位置:" prop="position">
-                    <el-checkbox-group v-model="form.position">
-                        <el-checkbox v-for="it in positions" :key="it.key" :label="it.name" :value="it.key" name="position"></el-checkbox>
-                    </el-checkbox-group>
-                </el-form-item>
-                <el-form-item label="添加段落:" prop="addPrg">
-                    <div class="add-prg">
-                        <el-form-item label="标题" prop="title" label-width="80px">
-                            <el-input v-model="form.title"></el-input>
-                        </el-form-item>
-                        <el-form-item label="内容" prop="desc" label-width="80px">
-                            <InfoUeditor v-model="msg" :config="config"></InfoUeditor>
-                        </el-form-item>
-                    </div>
-                </el-form-item>
-                <el-form-item>
-                    <el-button>添加段落</el-button >
-                </el-form-item>
-                <p class="line"></p>
-                <TagPool :pool="tagPool"
-                         :sexType="sexType"
-                         @changeActionData="changeActionData"></TagPool>
                 </el-form>
                 <div class="btn">
                     <el-button
@@ -58,91 +48,160 @@
   import api from '@api/icss.js';
   import utils from '@api/utils.js';
   import TagPool from './PromptTagPool';
-  import InfoUeditor from 'vue-ueditor-wrap';
+  import schema from 'async-validator';
+  import InfoParagraph from './InfoParagraph';
+
   export default {
     name: 'AddPromptInfo',
     components: {
       TagPool,
-      InfoUeditor
+      InfoParagraph
     },
     data() {
+      const validateTags = (rule,value,callback)=>{
+        if(this.form.selectedTags.length==0){
+          this.warning('请选择关联标签!');
+          return;
+        }
+        callback();
+      };
       return {
-        msg:'',
-        config:{
-          initialFrameWidth: null,
-          initialFrameHeight: 350,
-          serverUrl: 'http://192.168.2.236:5050/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']]      //自定义工具
+        isEdit:false,
+        tagPool:[],                 //标签池数据
+        Adscriptions:[],            //归属列表
+        editData:{
+          tagFor:'',
+          selectedTags:[],
+          prags:[]
         },
-        tagPool:[],
-        sexType:'1',
-        positions:[],
         form:{
           name:'',
-          isReason:'0',
-          position:[]
+          tagFor:'',
+          selectedTags:[],            //关联标签
+          prags:[{              //单个段落相关
+            title:'',
+            content:'',
+            isReason:0,
+            orderNo:0,
+            position:[],
+            text:''}]
         },
         rules: {
           name: [
             { required: true, message: '静态知识名称不能为空', trigger: 'change' }
           ],
-          isReason: [
-            { required: true, message: '请选择是否属于诊断', trigger: 'change' }
-          ],
-          position: [
-            { required: true, message: '请选择显示位置', trigger: 'change' }
-          ],
+          tags:[
+            { required: true, validator: validateTags, trigger: 'submit' }
+          ]
         }
       }
     },
     created:function(){
       const {isEdit,data} = this.$route.params;
-      //显示位置枚举列表
-      const pos = localStorage.getItem("icssEnumsData");
-      this.positions = JSON.parse(pos)&&JSON.parse(pos).introducePositionEnum;
+      this.getDropList();           //标签归属列表获取
       if(isEdit){
-        this.editData = data;
+        this.isEdit = isEdit;
+        const id = data.id;
+        api.getPrompDetail({id}).then((res) =>{
+          if(res.data.code === '0') {
+            this.form = this.parseData(res.data.data);
+            this.editData = Object.assign({},this.form);
+          }else{
+            this.warning("数据获取失败");
+          }
+        })
       }
     },
     methods: {
       back() { this.$router.go(-1) },
-      submitForm() {      // 调用子组件的方法验证公用部分
-        this.$refs.groups.validate((valid) => {
-          if (valid) {
-            //this.$emit('validatePass', this.form, false)
-          } else {
-            console.log('error submit!!');
-            return false;
-          }
-        });;
+      mapStringToNum(str){
+        return str.split(",").map((it)=>{
+          return +it;
+        })
       },
-      changeActionData(){
-
+      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
+        };
       },
-      validatePass() {      //验证成功回调,调取接口
-        //仍需验证标签明细是否选择
-        /*if (this.itemsTypes.includes(+this.dataPub.region2)&&this.options.length==0) {
-          this.$message({
-            message: '至少填一个选项',
-            type: 'warning'
-          });
+      addParagraph(){
+        this.form.prags.push({title:'',
+          content:'',
+          isReason:0,
+          orderNo:0,
+          position:[],
+          text:''});
+      },
+      delParagraph(i){
+        if(this.form.prags.length==1){
+          this.warning('只剩一个段落,不能再删啦!');
           return;
-        }*/
-        const {isEdit,data} = this.$route.params;
-        let param = {
+        }
+        this.showConfirmDialog('确定要删除该段落?', () => {
+            this.form.prags.splice(i,1);
+        });
+      },
+      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') {
+            this.Adscriptions = res.data.data[1];
+          }
+        })
+      },
+      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;
+            }
+          });
+        };
 
+        if(!goOn){
+          return;
+        }
+        //通过必填验证,提交保存
+       const param = {
+          name:this.form.name,
+          detailVOList:Object.assign(this.form.prags),
+          mapVOList:Object.assign(this.form.selectedTags)
         };
-        this.showSaveDialog(param);
+        //console.log(param);
+         this.showSaveDialog(param);
+      },
+      parseTagsForSubmit(data){
+        return data.map((it)=>{
+          return {questionId:it.id,introduceId:'',type:it.type};
+        });
+      },
+      changeActionData(selectedTags){
+        this.form.selectedTags = this.parseTagsForSubmit(selectedTags);
+        //console.log(selectedTags)
       },
       showSaveDialog(param) {
-        this.showConfirmDialog('是否保存该标签?', () => {
-          api.saveOrUpdate(param).then((res) => {
+        this.showConfirmDialog('是否保存该静态知识?', () => {
+          api.savePrompts(param).then((res) => {
             if (res.data.code === '0') {
               this.warning(res.data.msg || '保存成功', 'success');
               this.$router.push("/admin/LT-YXSJWH-TSXXWH");

+ 13 - 3
src/components/icss/BloodPressTagGroup.vue

@@ -31,7 +31,7 @@
     </div>
     <div class="bottomPartRight ">
       <p class="poolTitle">操作界面:</p>
-      <ul class="tagList operationPool">
+      <ul class="tagList operationPool templateTagList">
             <li class = "tagItem operationItem"
                 v-for="(item) in rightTagsList2" 
                 :key='item.id'
@@ -238,12 +238,13 @@ export default {
         },
         searchTagList() {
             let notIds = []
-            for (let i = 0; i < this.rightTagsList.length; i++) {
+            for (let i = 0; i < this.rightTagsList2.length; i++) {
                  if(typeof this.rightTagsList2[i].id === 'number') {
                     notIds.push(this.rightTagsList2[i].id)
                 }
                 
             }
+            
             let param1 = api.getGroupParams(3);            
             let param2 = {
                 "tagName": this.searchVal,
@@ -251,7 +252,7 @@ export default {
                 "notIds": notIds,
                 "sexType": this.sexType,
             }
-            let param = Object.assign(param1,param2)
+            let param = Object.assign({},param1,param2)
             api.searchTagList(param).then((res) => {
                 if (res.data.code === '0') {
                     this.leftTagsList = res.data.data
@@ -305,6 +306,7 @@ export default {
     .operationPool {
         position: relative;
         width: 85%;
+        padding: 10px;
     }
     .tagName {
         line-height: 30px;
@@ -345,6 +347,14 @@ export default {
         display: inline-block;
         line-height: 40px;
         margin: 0 5px 10px 0;
+        float: left;
+        text-align: center;
+        p {
+          padding: 5px 0;
+        }
+    }
+    .templateTagList {
+      height: 318px;
     }
     .active {
         color: #aBcdef;

+ 227 - 0
src/components/icss/CommonSymptom.vue

@@ -0,0 +1,227 @@
+<template>
+    <div>
+        <crumbs title="icss科室维护系统">
+            <el-form :inline="true" class="demo-form-inline">
+                <el-form-item label="科室名称:">
+                    <el-input size="mini" v-model="filter.proName" placeholder="科室名称"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button size="mini" @click="filterDatas">确认</el-button>
+                    <router-link to="/admin/LT-YXSJWH-TJCJZZ" 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
+                        :resizable = "false"
+                        type="index"
+                        :index="indexMethod"
+                        label="编号"
+                        width="60">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="gmtModified"
+                        label="操作时间"
+                        :show-overflow-tooltip="true">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="typeName"
+                        label="类型">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="name"
+                        label="科室名称">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="userName"
+                        label="操作人"
+                        width="180">
+                </el-table-column>
+                
+                <el-table-column
+                        :resizable = "false"
+                        label="操作" width="200">
+                    <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)">删除</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        label="详情">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" @click="getDetailList(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: 'CommonSymptom',
+    data: function () {
+      return {
+        list: [], //常见症状列表
+        cacheData: {},
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        linkIn:[],
+        pays:[],
+        filter: {
+          proName: ''
+        }
+      }
+    },
+    created() {
+      this.getDataList();
+    },
+    methods: {
+      toEditProduct(row){
+        const param = {
+            "deptId": row.id,
+            "type": row.type
+        }
+        api.getCommonSymptomById(param).then((res)=>{
+            const {code,data,msg} = res.data;
+            if(code=='0'){
+                const item = Object.assign({},row,data);
+                this.$router.push({name:'AddCommonSymptom',params:{isEdit:true,data:item}});
+            }else{
+                this.$message({
+                message: msg,
+                type: 'warning'
+                });
+            }
+        });
+
+      },
+      filterDatas(){
+        this.currentPage = 1;
+        this.getDataList();
+      },
+      getDataList() {
+        const param = this.getFilterItems();
+        // const param = {
+        //   'name':''
+        // };
+        api.commonSymptomList(param).then((res) => {
+          if (res.data.code == '0') {
+            console.log('commonSymptomList', res)
+            const data = res.data.data;
+            this.list = data.records;
+            this.total = data.total;
+          }
+        }).catch((error) => {
+          console.log(error);
+        });
+      },
+      getDetailList(row) {
+        const param = {
+            "deptId": row.id,
+            "type": row.type
+        }
+        api.getCommonSymptomById(param).then((res)=>{
+            const {code,data,msg} = res.data;
+            if(code=='0'){
+                const item = Object.assign({},row,data);
+                this.$router.push({name:'AddCommonSymptom',params:{isEdit:true,data:item}});
+            }else{
+                this.$message({
+                message: msg,
+                type: 'warning'
+                });
+            }
+        });
+      },
+      getFilterItems() {
+        const param = {
+          name: this.filter.proName,
+          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(row){
+        this.showConfirmDialog('是否删除该科室症状?',()=>{
+          const param = {
+            "deptId": row.id,
+            "type": row.type
+          }
+          api.delCommonSymptom(param).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);
+          })
+        });
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+    @import "../../less/admin.less";
+    .status-span{
+        font-size: 12px;
+        margin-right:10px;
+        color: unset;
+    }
+    .delete{
+        color: red
+    }
+</style>

+ 412 - 0
src/components/icss/CommonTemplate.vue

@@ -0,0 +1,412 @@
+<template>
+  <div class="symptomTagGroupWrapper clearfix">
+    <div class="bottomPartLeft">
+      <p class="poolTitle">标签池</p>
+      <div class="pool">
+        <el-input
+          placeholder="请输入搜索内容"
+          v-model="searchVal"
+        >
+          <i
+            slot="prefix"
+            class="el-input__icon el-icon-search"
+          ></i>
+        </el-input>
+        <ul class="tagList templateTagList">
+          <li
+            v-for="(item, index) in leftTagsList"
+            class="tagItem"
+            :key='item.id'
+            :title="'[ '+item.tagName+' ]'"
+            :style="getStyle(item)?styles:null"
+            @click='selectLeftTag(item, index, $event)'
+          >
+            <p class="tagName ellipsis">{{item.tagName}} </p>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="bottomPartMid fl">
+      <p><span
+          class="el-icon-arrow-right"
+          @click="toRightList"
+        ></span></p>
+      <p><span
+          class="el-icon-arrow-left"
+          @click="toLeftList"
+        ></span></p>
+    </div>
+    <div class="bottomPartRight bottomPartRightTemplate">
+      <p class="poolTitle">模板内容:</p>
+      <el-form
+        class="subTemplate"
+        ref="groups"
+        :model="form"
+      >
+        <el-form-item
+          label="选择归属:"
+          prop="region"
+          size="mini"
+        >
+          <el-select
+            v-model="form.region"
+            placeholder="请选择模板归属"
+          >
+            <el-option
+              v-for="item in Adscriptions"
+              :label="item.name"
+              :value="item.val"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+          <el-button size="mini">添加</el-button>
+          <el-button size="mini">删除子模板</el-button>
+          <el-button size="mini">插入输入栏</el-button>
+
+          <el-button icon="el-icon-arrow-left" class="changeOrder changeOrderPub"></el-button>
+          <el-button icon="el-icon-arrow-right" class="changeOrderPub"></el-button>
+        </el-form-item>
+      </el-form>
+      <ul class="tagList operationPool templateTagLists">
+        <li
+          class="tagItem operationItem"
+          v-for="(item) in rightTagsList2"
+          :key='item.id'
+          :style="getStyle2(item)?styles:null"
+          @click='selectRightTag(item)'
+        >
+          <div class="inputBox">
+            <el-input
+              v-if="item.type === 'input'"
+              placeholder=""
+              v-model="item.text"
+            >
+            </el-input>
+          </div>
+          <p
+            v-if="item.tagName"
+            class="tagName  ellipsis"
+            :title="'[ '+item.tagName+' ]'"
+          >{{item.tagName}} </p>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+<script>
+import api from '@api/icss.js';
+import utils from '@api/utils.js';
+
+export default {
+  props: {
+    pool: {
+      default: () => [],
+      type: Array
+    },
+    type: {
+      default: '',
+      type: String
+    },
+    sexType: {
+      default: '',
+      type: String
+    },
+    options: {
+      default: () => [],
+      type: Array
+    },
+  },
+  data() {
+    return {
+      Adscriptions: [
+        { name: '添加病情变化', val: '1', id: '001' },
+        { name: '病程变化', val: '2', id: '002' },
+        { name: '添加其他症状', val: '3', id: '003' },
+      ],
+      form: {
+        region: '1',    //归属
+      },
+      leftTagsList: [],
+      selectLeftTagsList: [],
+      rightTagsList: [],
+      rightTagsList2: [],
+      selectRightTagsList: [],
+      searchVal: '',
+      styles: {
+        background: '#eae7e7'
+      },
+    }
+  },
+  mounted() {
+    this.rightTagsList2 = this.options
+    let newArr = []
+    for (let i = 0; i < this.rightTagsList2.length; i++) {
+      if (this.rightTagsList2[i].tagType == 8) {
+        newArr.push({ text: this.rightTagsList2[i].tagName, type: 'input', id: i + ',,,' })
+      } else {
+        if (i === 0) {
+          newArr.push({ text: '', type: 'input', id: i + ',,,' })
+        }
+        newArr.push(this.rightTagsList2[i])
+        if (!this.rightTagsList2[i + 1] || this.rightTagsList2[i + 1] && this.rightTagsList2[i + 1].tagType != 8) {
+          newArr.push({ text: '', type: 'input', id: i + ',,,,' })
+        }
+      }
+    }
+    this.rightTagsList2 = newArr
+    this.$emit('changeActionData', this.rightTagsList2, false);
+    this.searchTagList()
+    // this.leftTagsList = this.pool
+    // console.log('TAGPOOL', this.pool)
+  },
+  watch: {
+    pool(newVal, preVal) {
+      this.leftTagsList = newVal
+    },
+    searchVal(newVal, preVal) {
+      if (newVal.trim() == '') {
+        this.searchTagList()
+      } else if (newVal.trim() != preVal.trim()) {
+        this.searchTagList()
+      }
+    },
+  },
+  methods: {
+    selectLeftTag(tag, index, e) {
+      const hasTag = this.isHasTag(tag, this.selectLeftTagsList)
+      if (hasTag) {
+        this.selectLeftTagsList = this.selectLeftTagsList.filter(item => item.id !== tag.id)
+      } else {
+        this.selectLeftTagsList.push(tag);
+      }
+    },
+    selectRightTag(tag) {
+      const hasTag = this.isHasTag(tag, this.selectRightTagsList)
+      if (hasTag) {
+        this.selectRightTagsList = this.selectRightTagsList.filter(item => item.id !== tag.id)
+      } else {
+        this.selectRightTagsList.push(tag);
+      }
+    },
+    isHasTag(item, arr) {
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].id === item.id) {
+          return true;
+        }
+      }
+      return false;
+    },
+    getStyle(item) {       //左侧选中状态
+      return this.isHasTag(item, this.selectLeftTagsList)
+    },
+    getStyle2(item) {
+      return this.isHasTag(item, this.selectRightTagsList)
+    },
+    toLeftList() {
+      for (let i = 0; i < this.selectRightTagsList.length; i++) {
+        this.rightTagsList = this.rightTagsList.filter(item => item.id !== this.selectRightTagsList[i].id)
+      }
+      for (let i = 0; i < this.selectRightTagsList.length; i++) {//每次往回移时同时删掉下面输入框
+        if (this.selectRightTagsList[i].type !== 'input') {
+          for (let j = 0; j < this.rightTagsList2.length; j++) {
+            if (this.selectRightTagsList[i].id === this.rightTagsList2[j].id) {
+              if (this.rightTagsList2.length === 3) {
+                this.rightTagsList2 = []
+              } else {
+                this.rightTagsList2.splice(j, 2)
+              }
+            }
+          }
+        }
+      }
+      this.selectLeftTagsList = []
+      this.selectRightTagsList = []
+      this.searchTagList()
+      this.$emit('changeActionData', this.rightTagsList2, false);
+    },
+    toRightList() {
+      this.rightTagsList.push(...this.selectLeftTagsList);
+      let textItem = { text: '', type: 'input' }
+      for (let i = 0; i < this.selectLeftTagsList.length; i++) { //选中标签每个前后加入输入框
+        if (this.rightTagsList2.length === 0) {
+          let textItem1 = JSON.parse(JSON.stringify(textItem))
+          textItem1.id = this.selectLeftTagsList[i].id + ',,'
+          this.rightTagsList2.push(textItem1)
+        }
+        this.rightTagsList2.push(this.selectLeftTagsList[i]);
+        let textItem2 = JSON.parse(JSON.stringify(textItem))
+        textItem2.id = this.selectLeftTagsList[i].id + ','
+        this.rightTagsList2.push(JSON.parse(JSON.stringify(textItem2)))
+      }
+
+      for (let i = 0; i < this.rightTagsList.length; i++) {
+        this.leftTagsList = this.leftTagsList.filter(item => item.id !== this.rightTagsList[i].id)
+      }
+      this.selectLeftTagsList = []
+      this.selectRightTagsList = []
+      this.$emit('changeActionData', this.rightTagsList2, false);
+    },
+    searchTagList() {
+      let notIds = []
+      for (let i = 0; i < this.rightTagsList.length; i++) {
+        if (typeof this.rightTagsList2[i].id === 'number') {
+          notIds.push(this.rightTagsList2[i].id)
+        }
+      }
+      let param = {
+        "tagName": this.searchVal,
+        "type": this.type || '',
+        "notIds": notIds,
+      }
+      api.searchTagList(param).then((res) => {
+        if (res.data.code === '0') {
+          this.leftTagsList = res.data.data
+          this.selectLeftTagsList = []
+          this.selectRightTagsList = []
+        }
+      })
+    }
+
+  }
+}
+</script>
+<style lang="less" scoped>
+@import "../../less/common.less";
+.symptomTagGroupWrapper {
+  .bottomPartLeft {
+    width: 30%;
+    box-sizing: border-box;
+    float: left;
+  }
+  .poolTitle {
+    box-sizing: border-box;
+    margin-bottom: 20px;
+  }
+  .inputBox {
+    width: 100px;
+  }
+  .search {
+    width: 100%;
+    border-bottom: 1px solid @icssBorder;
+    box-sizing: border-box;
+    height: 30px;
+  }
+  .tagList {
+    overflow-y: auto;
+    border: 1px solid @icssBorder;
+  }
+  .tagItem {
+    line-height: 30px;
+    padding: 0px 10px;
+    box-sizing: border-box;
+  }
+  .operationPool {
+    position: relative;
+    width: 85%;
+    padding: 10px;
+    box-sizing: border-box;
+  }
+  .tagName {
+    line-height: 30px;
+  }
+  .tagName:before {
+    content: "[";
+  }
+  .tagName::after {
+    content: "]";
+  }
+  .bottomPartMid {
+    width: 8%;
+    margin-top: 60px;
+    p {
+      width: 100%;
+      text-align: center;
+      span {
+        cursor: pointer;
+        display: inline-block;
+        width: 30px;
+        height: 40px;
+        line-height: 40px;
+        margin: 0 auto;
+        border: 1px solid @icssBorder;
+        margin-bottom: 15px;
+        font-size: 18px;
+      }
+    }
+  }
+  .bottomPartRight {
+    float: left;
+    width: 60%;
+    .changeOrder {
+      margin-left: 20px;
+    }
+  }
+  .templateTagList {
+    height: 450px;
+  }
+  .templateTagLists {
+    height: 468px;
+    width: 98%;
+  }
+  button {
+    // margin-top: 20px;
+  }
+  .operationItem {
+    display: inline-block;
+    line-height: 40px;
+    margin: 0 5px 10px 0;
+    text-align: center;
+    float: left;
+    p {
+      padding: 5px 0;
+    }
+  }
+  .active {
+    color: #abcdef;
+  }
+}
+</style>
+<style lang="less">
+@import "../../less/common.less";
+.bottomPartRightTemplate {
+  .subTemplate {
+    // display: inline-block;
+  }
+  .el-form-item__content {
+    .el-input__inner {
+      height: 30px;
+      line-height:30px;
+      border-radius:5px;
+      font-size: 14px;
+    }
+    .el-select {
+      margin-right:10px;
+    }
+    .el-button--mini[data-v-2db8be7a], .el-button--mini.is-round[data-v-2db8be7a] {
+      padding: 5px 8px 4px;
+    }
+    .el-button--mini[data-v-2db8be7a].changeOrderPub, .el-button--mini.is-round[data-v-2db8be7a].changeOrderPub {
+      padding: 5px 12px;
+    }
+    .el-button:hover {
+        color: @adminBase;
+        border-color: @adminBase;
+        outline: 0;
+        opacity: 1;
+        background-color: #fff;
+    }
+    .el-button:active {
+        color: @adminBase;
+        border-color: @adminBase;
+        outline: 0;
+    }
+    .el-button:focus {
+      background-color: #fff;
+      color: @adminBase;
+      opacity: 1;
+    }
+  }
+}
+  
+</style>
+

+ 24 - 17
src/components/icss/IndeptLabel.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="独立标签维护" style="min-width: 980px">
+        <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>
@@ -9,7 +9,7 @@
                 </el-form-item>-->
                 <el-form-item label="标签归属:">
                     <el-select size="mini" v-model="filter.tagAdscription" @change="getValue"  placeholder="标签归属" clearable>
-                        <el-option v-for="item in Adscriptions" :label="item.name" :value="item.val" :key="item.id" ></el-option>
+                        <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>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="标签系统名称:">
@@ -27,33 +27,40 @@
                     border
                     style="width: 100%">
                 <el-table-column
+                        :resizable = "false"
                         type="index"
                         :index = 'indexMethod'
                         label="编号"
                         width="60">
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="gmtModified"
                         label="操作时间"
                         width="180">
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="typeCn"
                         label="标签归属">
                 </el-table-column>
                 <el-table-column
-                        prop="controlTypeCn"
+                        :resizable = "false"
+                        prop="tagTypeCn"
                         label="标签类型">
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="tagName"
                         label="标签系统名称">
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="modifier"
                         label="操作人">
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="operate"
                         label="操作">
                     <template slot-scope="scope">
@@ -71,7 +78,7 @@
                         :total="total">
             </el-pagination>
         </div>
-        <!-- <div class="pagination"> 
+        <!-- <div class="pagination">
             <el-pagination v-if="total>pageSize"
                         :current-page.sync="currentPage"
                         @current-change="currentChange"
@@ -81,7 +88,7 @@
                         :total="total">
             </el-pagination>
         </div> -->
-        
+
     </div>
 </template>
 
@@ -95,7 +102,6 @@
         list: [],
         tagTypes: [],
         Adscriptions: [],
-        tagTypesList: [],
         filter: {
           tagType: [], //标签类型
           tagAdscription: '', //标签归属
@@ -122,34 +128,29 @@
           if(res.data.code === '0') {
             this.Adscriptions = res.data.data[1];
             this.tagTypes =  res.data.data[6];
-            for (var i = 0; i < this.tagTypes.length; i++) {
-              this.tagTypesList.push(this.tagTypes[i].val)
-            }
           }
 
         })
       },
       getDataList() {
         const param = this.getFilterItems();
-        console.log('param', param)
         api.getTagList(param).then((res) => {
-          const list = res.data.data.records
+          const list = [...res.data.data.records];
           for (var i = 0; i < list.length; i++) {
             for (var j =  0; j < this.tagTypes.length; j++) {
-              if(list[i].tagType === this.tagTypes[j].val) {
+              if(list[i].tagType == this.tagTypes[j].val) {
                 list[i].tagTypeCn = this.tagTypes[j].name;
               }
             }
+            //后台数据typeCn转换为筛选中对应的字段名称
             for (var z =  0; z < this.Adscriptions.length; z++) {
-              if(list[i].type === this.Adscriptions[z].val) {
-                list[i].typeCn = this.Adscriptions[z].name
+              if(list[i].type == this.Adscriptions[z].val) {
+                list[i].typeCn = this.Adscriptions[z].name;
               }
             }
-
           }
           this.list = list;
           this.total = res.data.data.total;
-          console.log('tagGroup',res)
         })
       },
       filterDatas() {
@@ -236,9 +237,15 @@
 <style lang="less">
   @import "../../less/admin.less";
     .delete{
-        color: red;
+        color: red
     }
     .delete:hover {
         color: red;
     }
+    .el-select .el-input .el-select__caret{
+        display: inline-block!important;
+    }
+    .el-select .el-input .el-icon-circle-close{
+        float:left;
+    }
 </style>

+ 104 - 0
src/components/icss/InfoParagraph.vue

@@ -0,0 +1,104 @@
+<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-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 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-form-item>
+            <el-form-item label="内容" prop="content" label-width="130px">
+                <InfoUeditor v-model="data.content" :config="config"></InfoUeditor>
+            </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 InfoUeditor from 'vue-ueditor-wrap';
+  export default{
+    props:['data','index','isEdit'],
+    name:'InfoParagraph',
+    components:{
+      InfoUeditor
+    },
+    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']]      //自定义工具
+          },
+          form:{},
+          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' }
+            ],
+          }
+        }
+    },
+    watch:{
+      'data.content':{          //content改变时传值
+        handler(newVal,oldVal){
+          this.emitVal();
+        }
+      }
+    },
+    created(){
+      //显示位置枚举列表
+      const pos = localStorage.getItem("icssEnumsData");
+      this.positions = JSON.parse(pos)&&JSON.parse(pos).introducePositionEnum;
+      this.form = this.data;console.log(this.isEdit)
+    },
+    methods:{
+      addEmit(){
+        this.$emit("add");
+      },
+      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(","):''});
+        this.$emit("change",this.index,data);
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+   .is-error .el-form-item__error{
+        top:auto;
+    }
+
+</style>

+ 12 - 2
src/components/icss/LabelGroup.vue

@@ -27,33 +27,40 @@
                 border
                 style="width: 100%">
                 <el-table-column
+                    :resizable = "false"
                     type="index"
                     :index = 'indexMethod'
                     label="编号"
                     width="60">
                 </el-table-column>
                 <el-table-column
+                    :resizable = "false"
                     prop="gmtModified"
                     label="操作时间"
                     width="180">
                 </el-table-column>
                 <el-table-column
+                    :resizable = "false"
                     prop="typeCn"
                     label="标签归属">
                 </el-table-column>
                 <el-table-column
+                    :resizable = "false"
                     prop="tagTypeCn"
                     label="标签类型">
                 </el-table-column>
                 <el-table-column
+                    :resizable = "false"
                     prop="tagName"
                     label="标签系统名称">
                 </el-table-column>
                 <el-table-column
+                    :resizable = "false"
                     prop="modifier"
                     label="操作人">
                 </el-table-column>
                 <el-table-column
+                    :resizable = "false"
                     prop="operate"
                     label="操作">
                     <template slot-scope="scope">
@@ -62,14 +69,17 @@
                     </template>
                 </el-table-column>
             </el-table>
-        <el-pagination v-if="total>pageSize"
+        <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>
+            </el-pagination>
+        </div>
+        
         </div>
        <!--  <div class="pagination">
            <el-pagination v-if="total>pageSize"

+ 187 - 0
src/components/icss/MedicinePrompt.vue

@@ -0,0 +1,187 @@
+<template>
+    <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>
+                <el-form-item label="标签系统名称:">
+                    <el-input size="mini" v-model="filter.tagName" placeholder="标签系统名称" clearable></el-input>
+                </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">
+                        <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="gmtOperate"
+                        label="操作时间"
+                        width="180"
+                        :show-overflow-tooltip="true">
+                </el-table-column>
+                <el-table-column
+                        prop="name"
+                        label="静态知识名称">
+                </el-table-column>
+                <el-table-column
+                        prop="tagName"
+                        label="关联标签"
+                        width="240">
+                </el-table-column>
+                <el-table-column
+                        prop="operatorName"
+                        label="操作人"
+                        width="80">
+                </el-table-column>
+
+                <el-table-column
+                        label="操作" width="120">
+                    <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>
+                    </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: 'prompt-info',
+    data: function () {
+      return {
+        list: [],
+        cacheData: {},
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        linkIn:[],
+        pays:[],
+        filter: {
+          name: '',
+          tagName:''
+        }
+      }
+    },
+    created() {
+      this.getDataList();
+    },
+    methods: {
+      toEditProduct(row){
+        this.$router.push({
+          name:'AddPromptInfo',
+          params: {data:row,isEdit:true}
+        })
+      },
+      filterDatas(){
+        this.currentPage = 1;
+        this.getDataList();
+      },
+      getDataList() {
+        const param = this.getFilterItems();
+        // const param = {
+        //   'name':''
+        // };
+        api.getPromptList(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);
+        });
+      },
+      getDetailList(id) {
+        const param = {'id': id,};
+        this.$router.push({name:'PromptDetail', params:{id: id}})
+      },
+      getFilterItems() {
+        const param = {
+          name:this.filter.name,
+          tagName:this.filter.tagName,
+          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.delPromptInfo({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);
+          })
+        });
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+    @import "../../less/admin.less";
+    .status-span{
+        font-size: 12px;
+        margin-right:10px;
+        color: unset;
+    }
+</style>

+ 8 - 4
src/components/icss/NoiseTemplate.vue

@@ -3,7 +3,7 @@
     <div class="groupTitle"><i
         class="el-icon-back"
         @click="back"
-      ></i> 标签组维护--添加标签组</div>
+      ></i> {{txt}}</div>
     <PubTagGroup
       :editData="editData"
       @changeVal="changeVal"
@@ -13,7 +13,7 @@
       ref="submitForm"
     ></PubTagGroup>
     <div class="main">
-      <p v-if="dataPub.region1 != 6 && dataPub.region1 != 7 && dataPub.region1 != 8" class="title"> <i>*</i> 标签明细:</p>
+      <p v-if="dataPub.region1 != 6 && dataPub.region1 != 7 && dataPub.region1 != 8 && dataPub.region1 != 9" class="title"> <i>*</i> 标签明细:</p>
       <PubTagPartDetail
         :pool="dataPub.tagPool"
         :type="dataPub.region1"
@@ -23,7 +23,7 @@
         :tipLis="dataPub.tipLis"
         :choose="dataPub.region2 == 6?'multiple':'single'"
         :options="editData.questionMapping"
-        v-show="dataPub.region2 == 2 || dataPub.region2 == 6"
+        v-if="dataPub.region2 == 2 || dataPub.region2 == 6"
         @changeActionData="changeActionData"
       ></PubTagPartDetail>
       <SymptomTagGroup 
@@ -113,6 +113,7 @@ export default {
   name: 'NoiseTemplateWrapper',
   data() {
     return {
+      txt:'标签组维护--添加标签组',
       dataPub: {},      //公用组件传的值都在这
       editData:{},                    //编辑数据
       form: {
@@ -129,6 +130,7 @@ export default {
   beforeMount:function(){
     const {isEdit,data} = this.$route.params;
     if(isEdit){
+      this.txt = '标签组维护--修改标签组';
       this.editData = data;
       // console.log('回读数据', this.editData)
     }
@@ -158,6 +160,7 @@ export default {
       // console.log(type)
     },
     changeActionData(arr) {          //标签明细右侧数据id
+    console.log(44254165456)
       this.sendIds = arr
     },
     submitForm() {       // 调用子组件的方法验证公用部分
@@ -166,7 +169,7 @@ export default {
     validatePass() {      //验证成功回调,调取接口
       //仍需验证标签明细是否选择
       let type = this.dataPub.region1;
-      if (JSON.stringify(this.sendIds) == '[[],[],[],[],[],[]]' && type != 6 && type != 7 && type != 8) {
+      if (JSON.stringify(this.sendIds) == '[[],[],[],[],[],[]]' && type != 6 && type != 7 && type != 8 && type != 9) {
         this.$message({
           message: '请选择标签明细',
           type: 'warning'
@@ -269,6 +272,7 @@ export default {
   }
   .btn {
     text-align: right;
+    margin-top: 10px;
   }
   .order {
     margin-bottom: 20px;

+ 216 - 0
src/components/icss/PhysicalExamTemplate.vue

@@ -0,0 +1,216 @@
+<template>
+    <div>
+        <crumbs title="查体模板维护">
+            <el-form :inline="true" class="demo-form-inline">
+                <el-form-item label="科室名称:">
+                    <el-input size="mini" v-model="filter.proName" placeholder="科室名称"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button size="mini" @click="filterDatas">确认</el-button>
+                    <router-link to="/admin/LT-YXSJWH-TJCTMB" 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
+                        :resizable = "false"
+                        type="index"
+                        :index="indexMethod"
+                        label="编号"
+                        width="60">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="gmtOperate"
+                        label="操作时间"
+                        :show-overflow-tooltip="true">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="name"
+                        label="科室名称">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="operatorName"
+                        label="操作人"
+                        width="180">
+                </el-table-column>
+                
+                <el-table-column
+                        :resizable = "false"
+                        label="操作" width="200">
+                    <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.id)">删除</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        label="详情">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" @click="getDetailList(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: 'PhysicalExamTemplate',
+    data: function () {
+      return {
+        list: [], //常见症状列表
+        cacheData: {},
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        linkIn:[],
+        pays:[],
+        filter: {
+          proName: ''
+        }
+      }
+    },
+    created() {
+      this.getDataList();
+    },
+    methods: {
+      toEditProduct(row){
+        api.getPhysicalExamTempByDepId({deptId:row.id}).then((res)=>{
+            const {code,data,msg} = res.data;
+            if(code=='0'){
+                const item = Object.assign({},row,data);
+                console.log('item', item)
+                this.$router.push({name:'AddPhysicalExamTemp',params:{isEdit:true,data:item}});
+            }else{
+                this.$message({
+                message: msg,
+                type: 'warning'
+                });
+            }
+        });
+
+        // this.$router.push({
+        //   name:'AddPhysicalExamTemp',
+        //   params: {info:row}
+        // })
+      },
+      filterDatas(){
+        this.currentPage = 1;
+        this.getDataList();
+      },
+      getDataList() {
+        const param = this.getFilterItems();
+        // const param = {
+        //   'name':''
+        // };
+        api.getPhysicalExamTempList(param).then((res) => {
+          if (res.data.code == '0') {
+            console.log('PhysicalExamTempList', res)
+            const data = res.data.data;
+            this.list = data.records;
+            this.total = data.total;
+          }
+        }).catch((error) => {
+          console.log(error);
+        });
+      },
+      getDetailList(row) {
+        const param = {'deptId': row.id,};
+        api.getPhysicalExamTempByDepId(param).then((res)=>{
+            const {code,data,msg} = res.data;
+            if(code=='0'){
+                const item = Object.assign({},row,data);
+                this.$router.push({name:'AddPhysicalExamTemp',params:{isDetail:true,data:item}});
+            }else{
+                this.$message({
+                message: msg,
+                type: 'warning'
+                });
+            }
+        });
+      },
+      getFilterItems() {
+        const param = {
+          name: this.filter.proName,
+          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.delPhysicalExamTemp({'deptId':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);
+          })
+        });
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+    @import "../../less/admin.less";
+    .status-span{
+        font-size: 12px;
+        margin-right:10px;
+        color: unset;
+    }
+    .delete{
+        color: red
+    }
+</style>

+ 116 - 0
src/components/icss/PromptDetail.vue

@@ -0,0 +1,116 @@
+<template>
+    <div class="NoiseTemplateWrapper TemplateWrapper">
+        <div class="groupTitle"><i
+                class="el-icon-back"
+                @click="back"
+        ></i> 提示信息维护--详情</div>
+        <div class="info-container">
+            <el-form label-width="130px"
+                     ref="groups">
+                <el-form-item label="静态知识名称:">
+                    {{editData.name}}
+                </el-form-item>
+                <p class="line"></p>
+                <div class="add-prg" v-for="prg in editData.details">
+                    <el-form-item label="是否属于诊断:">
+                        {{prg.isReason?'是':'否'}}
+                    </el-form-item>
+                    <el-form-item label="显示位置:">
+                        {{parsePosition(prg.position)}}
+                    </el-form-item>
+                    <el-form-item label="标题:">
+                        {{prg.title}}
+                    </el-form-item>
+                    <el-form-item label="内容:">
+                        <div v-html="prg.content"></div>
+                    </el-form-item>
+                </div>
+                <p class="line"></p>
+                <el-form-item label="关联标签:">
+                    <span class="tag" v-for="it in editData.questionList">
+                        {{it.name}}
+                    </span>
+                </el-form-item>
+            </el-form>
+        </div>
+    </div>
+</template>
+<script>
+  /**
+   *
+   */
+  import api from '@api/icss.js';
+
+  export default {
+    name: 'PromptDetail',
+    data() {
+      return {
+        editData:{},
+        positions:[],
+        position:''
+      }
+    },
+    created:function(){
+      const {id} = this.$route.params;
+      const pos = localStorage.getItem("icssEnumsData");
+      this.positions = JSON.parse(pos)&&JSON.parse(pos).introducePositionEnum;
+
+      api.getPrompDetail({id}).then((res) =>{
+        if(res.data.code === '0') {
+          this.editData = res.data.data;
+        }else{
+          this.warning("数据获取失败");
+        }
+      })
+    },
+    methods: {
+      back() { this.$router.go(-1) },
+      parsePosition(item){
+        const sit = item||[];
+        let text = '';
+        this.positions.forEach((it)=>{
+          if(sit.split(",").includes(it.key+'')){
+            text+=it.name+',';
+          }
+        });
+        return text.replace(/,$/,'');
+      },
+      warning(msg, type) {
+        this.$message({
+          showClose: true,
+          message: msg,
+          type: type || 'warning'
+        })
+      },
+    }
+  }
+</script>
+<style lang="less">
+    @import "../../less/common.less";
+    .info-container{
+        background: #fff;
+        padding: 20px;
+        margin: 20px 20px -20px 20px;
+    .el-input__inner{
+        width: 200px;
+    }
+    .el-form-item__label{
+        text-align: left;
+    }
+    .add-prg .el-form-item{
+        margin-bottom: 20px;
+    }
+    }
+    .line{
+        border-top:1px #dcdfe6 solid;
+        margin-bottom: 25px;
+    }
+    .tag:before{
+        content:'['
+    }
+    .tag:after{
+        content: ']';
+        margin-right: 10px;
+    }
+</style>
+

+ 18 - 23
src/components/icss/PromptInfo.vue

@@ -3,10 +3,10 @@
         <crumbs title="提示信息维护">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="静态知识名称:">
-                    <el-input size="mini" v-model="filter.proName" placeholder="静态知识名称"></el-input>
+                    <el-input size="mini" v-model="filter.name" placeholder="静态知识名称" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="标签系统名称:">
-                    <el-input size="mini" v-model="filter.proName" placeholder="标签系统名称"></el-input>
+                    <el-input size="mini" v-model="filter.tagName" placeholder="标签系统名称" clearable></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
@@ -21,33 +21,39 @@
                       border
                       style="width: 100%">
                 <el-table-column
+                        :resizable = "false"
                         type="index"
                         :index="indexMethod"
                         label="编号"
                         width="60">
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="gmtOperate"
                         label="操作时间"
                         width="180"
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="name"
                         label="静态知识名称">
                 </el-table-column>
                 <el-table-column
-                        prop="questionList"
+                        :resizable = "false"
+                        prop="tagName"
                         label="关联标签"
                         width="240">
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="operatorName"
                         label="操作人"
                         width="80">
                 </el-table-column>
 
                 <el-table-column
+                        :resizable = "false"
                         label="操作" width="120">
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click="toEditProduct(scope.row)">修改</el-button>
@@ -56,6 +62,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         label="详情">
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click="getDetailList(scope.row.id)">详情</el-button>
@@ -91,7 +98,8 @@
         linkIn:[],
         pays:[],
         filter: {
-          proName: ''
+          name: '',
+          tagName:''
         }
       }
     },
@@ -102,7 +110,7 @@
       toEditProduct(row){
         this.$router.push({
           name:'AddPromptInfo',
-          params: {info:row}
+          params: {data:row,isEdit:true}
         })
       },
       filterDatas(){
@@ -127,25 +135,12 @@
       },
       getDetailList(id) {
         const param = {'id': id,};
-        this.$router.push({name:'DeptInfoDetail', params:{id: id}})
-        /*api.getDeptInfoDetials(param).then((res) => {
-          if (res.data.code == '0') {
-            this.$router.push({name:'DeptInfoDetail', params:{id: id}})
-            // console.log("详情接口调用成功");
-          } else {
-            this.$message({
-              showClose: true,
-              message:res.data.msg,
-              type:'warning'
-            });
-            this.getDataList()  //刷新列表
-          }
-        }).catch((error) => {
-          console.log(error);
-        });*/
+        this.$router.push({name:'PromptDetail', params:{id: id}})
       },
       getFilterItems() {
         const param = {
+          name:this.filter.name,
+          tagName:this.filter.tagName,
           current: this.currentPage,
           size: this.pageSize
         };
@@ -178,8 +173,8 @@
         }).catch(() => {});
       },
       showDelDialog(id){
-        this.showConfirmDialog('是否删除该科室?',()=>{
-          api.deleteDeptInfo({id}).then((res)=>{
+        this.showConfirmDialog('是否删除该静态知识?',()=>{
+          api.delPromptInfo({id}).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();

+ 26 - 27
src/components/icss/PromptTagPool.vue

@@ -4,7 +4,7 @@
       <p class="poolTitle">标签池:</p>
       <div class="pool">
         <el-input placeholder="请输入搜索内容"
-                v-model="searchVal">
+                v-model="searchVal" clearable>
           <i slot="prefix"
              class="el-input__icon el-icon-search"
           ></i>
@@ -27,7 +27,7 @@
       <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
     </div>
     <div class="bottomPartRight ">
-      <p class="poolTitle">操作界面:</p>
+      <p class="poolTitle">已选标签:</p>
       <ul class="tagList operationPool">
         <li class = "tagItem operationItem"
             v-for="(item) in rightTagsList"
@@ -56,10 +56,10 @@
         default: '',
         type: String
       },
-      sexType: {
-        default: '',
-        type: String
-      },
+      selected:{
+        default:[],
+        type:Array
+      }
     },
     data() {
       return {
@@ -72,9 +72,6 @@
           background:'#eae7e7'
         },
       }
-    },
-    mounted() {
-
     },
     watch: {
       pool(newVal, preVal) {
@@ -82,27 +79,31 @@
           this.leftTagsList = newVal
         }
       },
-      searchVal(newVal, preVal){
-        if(newVal.trim() == ''){
-          this.searchTagList()
-        }else if(newVal.trim() != preVal.trim()){
-          this.searchTagList()
+      selected(newVal, preVal) {
+        if (JSON.stringify(newVal) != JSON.stringify(preVal)) {console.log(newVal)
+          this.rightTagsList = newVal
         }
       },
-      sexType(newVal, preVal) {
-        if (newVal != preVal) {
-          if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+      searchVal(newVal, preVal){
+        if(newVal.trim() == ''){
+          if(this.type==''){    //清空搜索时清空或回到原始
             this.leftTagsList = [];
-            this.selectLeftTagsList = [];
-            this.rightTagsList = [];
-            this.selectRightTagsList = [];
-            this.searchVal = '';
+          }else{
             this.searchTagList();
           }
+        }else if(newVal.trim() != preVal.trim()){
+          this.searchTagList()
         }
       },
-
-
+      type(newVal, preVal) {
+        if(newVal.trim()==''&&this.searchVal.trim()==''){
+          this.leftTagsList = [];
+          return ;
+        }
+        if(this.searchVal.trim()!=''||newVal != preVal){
+          this.searchTagList()
+        }
+      }
     },
     methods: {
       selectLeftTag(tag, index, e) {
@@ -133,8 +134,6 @@
         return false;
       },
       getStyle(item){       //左侧选中状态
-        // console.log('selected',utils.filterArr(this.leftTagsList,item,2))
-        // return utils.filterArr(this.selectLeftTagsList,item,2)
         return this.isHasTag(item, this.selectLeftTagsList)
       },
       getStyle2(item) {
@@ -157,7 +156,7 @@
           this.leftTagsList = this.leftTagsList.filter(item => item.id !== this.rightTagsList[i].id)
         }
         this.selectLeftTagsList = []
-        this.selectRightTagsList = []
+        this.selectRightTagsList = [];
         this.$emit('changeActionData',this.rightTagsList, false);
       },
       searchTagList() {
@@ -174,7 +173,7 @@
           "controlType": [],
           "type": this.type || '',
           "notIds": notIds,
-          "sexType": this.sexType,
+          "sexType": 3,
 
         }
         api.searchTagList(param).then((res) => {

+ 30 - 28
src/components/icss/PubIndeptTag.vue

@@ -44,6 +44,30 @@
                             :key="item.id"
                     ></el-option>
                 </el-select>
+            </el-form-item>
+             <el-form-item
+                    label="性别:"
+                    prop="region7"
+            >
+                <span class="changeTips">改变性别后,标签明细将会恢复到默认状态</span>
+                <el-select
+                        v-model="form.region7"
+                        :disabled="!!editData.id || !form.region1 || form.region2 == '99'"
+                        @change="(e)=>readyChangeSelect(e,3)"
+                >
+                    <el-option
+                            label="通用"
+                            value="3"
+                    ></el-option>
+                    <el-option
+                            label="男"
+                            value="1"
+                    ></el-option>
+                    <el-option
+                            label="女"
+                            value="2"
+                    ></el-option>
+                </el-select>
             </el-form-item>
             <el-form-item
                     label="标签系统名称:"
@@ -73,7 +97,7 @@
                     label="标签前后缀:"
                     class="fix-inp"
                     prop="region12"
-                    v-if="form.region2==6"
+                    v-if="form.region2==6 || form.region2==7"
             >
                 <el-col :span="10">
                 <el-input v-model="form.prefix"
@@ -123,30 +147,7 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item
-                    label="性别:"
-                    prop="region7"
-            >
-                <span class="changeTips">改变性别后,标签明细将会恢复到默认状态</span>
-                <el-select
-                        v-model="form.region7"
-                        :disabled="!!editData.id || !form.region1 || form.region2 == '99'"
-                        @change="(e)=>readyChangeSelect(e,3)"
-                >
-                    <el-option
-                            label="通用"
-                            value="3"
-                    ></el-option>
-                    <el-option
-                            label="男"
-                            value="1"
-                    ></el-option>
-                    <el-option
-                            label="女"
-                            value="2"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
+           
             <el-form-item
                     label="年龄:"
                     prop="region8"
@@ -155,6 +156,7 @@
                 <el-input
                         v-model.number="form.region8"
                         :disabled="!form.region1 || form.region2 == '99'"
+                         type="number"
                         ref="valage1"
                         @input="sendData"
                 ></el-input>
@@ -398,14 +400,14 @@
         }
 
     }
-    .fix-inp .el-col .el-input__inner{
+    .PubTagGroupWrapper .fix-inp .el-col .el-input__inner{
         width: 100%;
         display: inline-block;
     }
-    .fix-inp .el-col-4{
+    .PubTagGroupWrapper .fix-inp .el-col-4{
         text-align: center;
     }
-    .fix-inp .el-col-8{
+    .PubTagGroupWrapper .fix-inp .el-col-8{
         text-align: center;
     }
     

+ 4 - 3
src/components/icss/PubTagGroup.vue

@@ -223,7 +223,8 @@ export default {
         '5':['7'],
         '6':['9'],
         '7':['9'],
-        '8':['9']
+        '8':['9'],
+        '9':['9']
       },
       rules: {
         region1: [
@@ -294,7 +295,7 @@ export default {
   watch: {
     newSex(nextVal, prevVal) {
       this.tmpSex = prevVal;
-      if (nextVal != prevVal || this.form.region2 == 2 || this.form.region2 == 6 || this.form.region2 == 7 || this.form.region2 == 9) {
+      if (nextVal != prevVal && (this.form.region2 == 2 || this.form.region2 == 6 || this.form.region2 == 7 || this.form.region2 == 4 || this.form.region2 == 11)) {
         this.searchTagList()
       }
     },
@@ -303,7 +304,7 @@ export default {
     },
     newSign(nextVal, prevVal) {
       this.tmpType = prevVal;
-      if (nextVal != prevVal || this.form.region2 == 2 || this.form.region2 == 6 || this.form.region2 == 7 || this.form.region2 == 9) {
+      if (nextVal != prevVal && (this.form.region2 == 2 || this.form.region2 == 6 || this.form.region2 == 7 || this.form.region2 == 4 || this.form.region2 == 11)) {
         this.searchTagList()
       }
     },

+ 216 - 0
src/components/icss/PubTemplateGroup.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="PubTagGroupWrapper">
+    <el-form
+      class="groups"
+      :rules="rules"
+      ref="groups"
+      :model="form"
+      label-width="150px"
+    >
+      <el-form-item
+        label="选择归属:"
+        prop="region1"
+      >
+        <span class="changeTips">改变归属后,模板明细将会恢复到默认状态</span>
+          <!-- :disabled="!!editData.id" -->
+        <el-select
+          v-model="form.region1"
+          placeholder="请选择模板归属"
+          @change="readyChangeSelect"
+        >
+          <el-option
+            v-for="item in Adscriptions"
+            :label="item.name"
+            :value="item.val"
+            :key="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="模板名称:"
+        prop="region2"
+      >
+        <el-input
+          v-model="form.region2"
+          :disabled="!form.region1"
+          maxLength="120"
+          placeholder="请输入模板名称"
+          @change="sendData"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import api from '@api/icss.js';
+
+/**
+ * 归属type
+ * 1:主诉模板 2:现病史模板 3:现病史空模板 4 : 其他史模板 5:嵌套模板 6:慢病模板
+ */
+
+
+export default {
+  props:['editData'],
+  data() {
+    var validatePass2 = (rule, value, callback) => {
+        const editData = this.$props.editData;
+        if(editData.id && value == editData.tagName){ //修改系统名称没变就不再校验
+          callback();    
+        }else{
+          this.validateSystomName(value,callback)
+        }
+    };
+    return {
+      Adscriptions:[
+        {name:'主诉模板',val:'1',id:'1001'},
+        {name:'现病史模板',val:'2',id:'1002'},
+        {name:'现病史空模板',val:'3',id:'1003'},
+        {name:'其他史模板',val:'4',id:'1004'},
+        {name:'嵌套模板',val:'5',id:'1005'},
+        {name:'慢病模板',val:'6',id:'1006'},
+      ],
+      form: {
+        region1: '1',    //归属
+        region2: '',     //模板名称
+      },
+      rules: {
+        region1: [
+          { required: true, message: '请选择模板归属', trigger: 'change' }
+        ],
+        region2: [
+          { required: true, message: '请输入模板名称', trigger: 'change' },
+          { validator: validatePass2, trigger: 'blur' },
+        ],
+      },
+    }
+  },
+  computed: {
+    newType() {
+      return this.form.region1;
+    },
+  },
+  mounted() {
+    const editData = this.$props.editData;
+    if(editData.id){      //修改
+      const trans = utils.transformKeys(editData,2);
+      this.form = Object.assign({},this.form,trans);
+    }
+    this.$emit('changeVal', this.form, false)
+  },
+  watch: {
+    newType(nextVal, prevVal) {
+      
+    },
+  },
+  methods:{
+    sendData(val){
+      console.log(val)
+    },
+    readyChangeSelect(val){
+      console.log(val)
+    },
+    validateSystomName(name,callback) {         //判断模板名称是否存在
+      if(this.form.region2.trim() == ''){ return }
+      let param = {
+        "existName": this.form.region2,     
+        "type": this.form.region1,
+        "notTagType":[8],        //去掉文字标签查重
+      }
+      api.validateSystomName(param).then((res) => {
+        if (res.data.code === '0') {
+          if(res.data.data && res.data.data.length != 0){
+            callback(new Error('该系统名称已存在'));
+          }else{
+            callback();
+          }
+        }
+      })
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$emit('validatePass', this.form, false)
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+  }
+}
+</script>
+<style lang="less">
+.PubTagGroupWrapper {
+  .groups {
+  background-color: #fff;
+  padding: 20px;
+  margin: 20px 20px -20px 20px;
+  .el-form-item__content,
+  .el-input__inner {
+    height: 30px;
+    line-height: 30px;
+    width: 200px;
+  }
+  .el-form-item {
+    margin-bottom: 20px;
+  }
+  .el-form-item__error {
+    top: 28px;
+  }
+  .el-form-item__label {
+    line-height: 30px;
+    text-align: left;
+  }
+  .el-input__icon {
+    line-height: 30px;
+  }
+  .verticalMiddle .el-form-item__content {
+    position: relative;
+    top: 16px;
+  }
+  .maxAges {
+    margin-left: -125px;
+  }
+  .ages {
+    display: inline-block;
+    .el-form-item__content {
+      width: auto;
+    }
+    .el-input {
+      display: inline-block;
+      width: auto;
+      .el-input__inner {
+        width: 60px;
+        padding: 0 5px;
+        margin-right: 25px;
+        text-align: center;
+      }
+
+      .el-input__inner::-webkit-outer-spin-button,
+      .el-input__inner::-webkit-inner-spin-button {
+        -webkit-appearance: none;
+      }
+
+      .el-input__inner[type="number"] {
+        -moz-appearance: textfield;
+      }
+    }
+  }
+  .el-message-box__btns .el-button--default {
+    color: #606266 !important;
+  }
+  .cancelColor {
+    color: #22ccc8 !important;
+  }
+  .changeTips {
+    position: absolute;
+    left: 220px;
+    min-width: 300px;
+    color: #22ccc8;
+    font-size: 12px;
+  }
+}
+}
+</style>
+

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

@@ -20,42 +20,50 @@
                       border
                       style="width: 100%">
                 <el-table-column
+                        :resizable = "false"
                         type="index"
                         :index="indexMethod"
                         label="编号"
                         width="60">
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="gmtOperate"
                         label="操作时间"
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="questionName"
                         label="标签名称"
                         show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="retrievalSelfName"
                         label="本体"
                         show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="retrievalNames"
                         label="别名"
                         show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="retrievalSonNames"
                         label="子项"
                         show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column
+                        :resizable = "false"
                         prop="operatorName"
                         label="操作人">
                 </el-table-column>
                 
                 <el-table-column
+                        :resizable = "false"
                         label="操作" width="160">
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click="toEditProduct(scope.row)">修改</el-button>

+ 17 - 17
src/components/icss/SingleSelect.vue

@@ -2,17 +2,17 @@
     <div class="single-container">
         <el-form>
             <div class="operation-row">
-                <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="focusOn==i||(focusOn==-1&&i==0)" :key="1+i" v-model="rows[i].defaultSelect" @change="emitValues(i,'hasDefault',rows[i].defaultSelect)">
-                    <el-checkbox-button  v-if=" ascription != 5 || type != 1" :label="i" :disabled="hasNone==i||hasBan==i|| hasCorrect==i || (hasDefault!=-1&&hasDefault!=i)">默认选中</el-checkbox-button>
+                <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="type!=2&&(focusOn==i||(focusOn==-1&&i==0))" :key="1+i" v-model="rows[i].defaultSelect" @change="emitValues(i,'hasDefault',rows[i].defaultSelect)">
+                    <el-checkbox-button  v-if=" !(ascription == 5 && type == 1 || type == 2)" :label="i" :disabled="hasNone==i||hasBan==i|| hasError==i || (hasDefault!=-1&&hasDefault!=i)">默认选中</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="2+i" v-model="rows[i].isNone" @change="emitValues(i,'hasNone',rows[i].isNone)">
-                    <el-checkbox-button  v-if=" ascription != 5 || type != 1" :label="i" :disabled="hasDefault==i||hasBan==i || hasCorrect==i ||(hasNone!=-1&&hasNone!=i)">同“无”类型</el-checkbox-button>
+                <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)" :label="i" :disabled="hasDefault==i||hasBan==i || hasError==i ||(hasNone!=-1&&hasNone!=i)">同“无”类型</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="3+i" v-model="rows[i].isBan" @change="emitValues(i,'hasBan',rows[i].isBan)">
-                    <el-checkbox-button v-if=" ascription!=5 || type != 1" :label="i" :disabled="hasDefault==i||hasNone==i || hasCorrect==i||(hasBan!=-1&&hasBan!=i)">同“伴”类型</el-checkbox-button>
+                <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)" :label="i" :disabled="hasDefault==i||hasNone==i || hasError==i||(hasBan!=-1&&hasBan!=i)">同“伴”类型</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].isCorrect" @change="emitValues(i,'hasCorrect',rows[i].isCorrect)">
-                    <el-checkbox-button v-if="ascription==5  && type == 1" :label="i" :disabled="hasDefault==i||hasBan==i ||hasNone==i ||(hasCorrect!=-1&&hasCorrect!=i)">标记正确选项</el-checkbox-button>
+                <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" :label="i" :disabled="hasDefault==i||hasBan==i ||hasNone==i ||(hasError!=-1&&hasError==i)">标记异常选项</el-checkbox-button>
                 </el-checkbox-group>
                 <el-button type="danger" size="small" class="del" @click="delRow">删除</el-button>
             </div>
@@ -85,8 +85,8 @@
       props:['type','options','ascription','sexType'],
       data(){
         return {
-          maps:{isBan:'同“伴”',isNone:'同“无”',defaultSelect:'默认选中',isCorrect:'正确选项'},
-          rows:[{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''}],
+          maps:{isBan:'同“伴”',isNone:'同“无”',defaultSelect:'默认选中',isError:'异常选项'},
+          rows:[{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''}],
           focusOn:-1
         }
       },
@@ -94,7 +94,7 @@
         const {options} = this.$props;
         if(options){
           const arr = options.map((it)=>{
-            return {name:it.name,defaultSelect:it.defaultSelect=='1'?true:false,isBan:it.code==1?true:'',isNone:it.code==2?true:'',isCorrect:it.code==3?true:''};
+            return {name:it.name,defaultSelect:it.defaultSelect=='1'?true:false,isBan:it.code==1?true:'',isNone:it.code==2?true:'',isError:it.abnormal==1?true:''};
           });
           this.rows = arr;
           const items = utils.simpleOptionData(this.rows);
@@ -128,9 +128,9 @@
           });
           return index;
         },
-        hasCorrect:function(){        //是否为正确选项
+        hasError:function(){        //是否为正确选项
           let index =this.rows.findIndex((it)=>{
-            return it.isCorrect;
+            return it.isError;
           });
           return index;
         }
@@ -139,28 +139,28 @@
         ascription(newVal, preVal) {
             if (newVal != preVal) {
                 if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-                    this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''}];
+                    this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''}];
                 }
             }
         },
         type(newVal, preVal) {
             if (newVal != preVal) {
                 if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-                    this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''}];
+                    this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''}];
                 }
             }
         },
         sexType(newVal, preVal) {
             if (newVal != preVal) {
                 if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-                    this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''}];
+                    this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''}];
                 }
             }
         },
       },
       methods:{
         addRow(){
-          this.rows.push({name:'',defaultSelect:'',isBan:'',isNone:'',isCorrect:''});
+          this.rows.push({name:'',defaultSelect:'',isBan:'',isNone:'',isError:''});
         },
         selectRow(index){
           this.focusOn = index;

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

@@ -108,11 +108,11 @@ export default {
             if(this.options.length) {
                 if(this.options.length === 2) {     //当两个模块都有值时
                     this.rightTagsList = this.options
-                    this.$emit('changeActionData',this.rightTagsList, false);
                     
                 } else if(this.options.length === 1) {
                     this.options[0].controlType == 99 ? this.rightTagsList.splice(1, 1, this.options[0]) :this.rightTagsList.splice(0, 1, this.options[0])
                 }
+                 this.$emit('changeActionData',this.rightTagsList, false);
                 this.searchTagList()
             }
 

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

@@ -109,7 +109,7 @@ export default {
           let newArr = []
           for (let i = 0; i < this.rightTagsList2.length; i++) {
               if(this.rightTagsList2[i].tagType == 8) {
-                  newArr.push({ text: this.rightTagsList2[i].tagName ,type:'input' ,id: i+',,,'})
+                  newArr.push({ text: this.rightTagsList2[i].tagName ,type:'input' ,id: i+',,,', symptomType: this.rightTagsList2[i].symptomType})
               } else {
                   if(i === 0 ) {
                       newArr.push({ text: '' ,type:'input' ,id: i+',,,'})
@@ -249,11 +249,11 @@ export default {
             }
             this.selectLeftTagsList = []
             this.selectRightTagsList = []
+            this.searchTagList()
             this.$emit('changeActionData',this.rightTagsList2, false);
         },
         searchTagList() {
             let notIds = []
-            console.log('this.rightTagsList2',this.rightTagsList2)
             for (let i = 0; i < this.rightTagsList2.length; i++) {
                 if(typeof this.rightTagsList2[i].id === 'number') {
                     notIds.push(this.rightTagsList2[i].id)

+ 226 - 0
src/components/icss/TemplateMaintenance.vue

@@ -0,0 +1,226 @@
+<template>
+    <div>
+        <crumbs title="模板维护" style="min-width: 980px">
+            <el-form :inline="true" class="demo-form-inline">
+                <el-form-item label="模板归属:">
+                    <el-select size="mini" v-model="filter.tagAdscription" @change="getValue"  placeholder="模板归属" clearable>
+                        <el-option v-for="item in Adscriptions" :label="item.name" :value="item.val" :key="item.id" ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button size="mini" @click="filterDatas">确认</el-button>
+                    <el-button size="mini" type="primary" @click="addIndeptTag">添加模板</el-button>
+                </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="编号"
+                        :resizable = "false"
+                        width="60">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="gmtModified"
+                        label="操作时间"
+                        width="180">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="name"
+                        label="模板名称">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="ascriptionName"
+                        label="归属">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="modifier"
+                        label="操作人">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="operate"
+                        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>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+        </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>
+
+<script>
+  import api from '@api/icss.js';
+
+  export default {
+    name: 'TemplateMaintenance',
+    data: function() {
+      return {
+        list: [],
+        tagTypes: [],
+        Adscriptions: [],
+        tagTypesList: [],
+        filter: {
+          tagType: [], //标签类型
+          tagAdscription: '', //标签归属
+          tagSysName: '', //标签系统名称
+        },
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+      }
+    },
+    created() {
+      this.getDropList().then(() => {
+        this.getDataList()
+      })
+
+    },
+    methods: {
+      getValue(val) {
+        console.log('changeVal', val, this.filter.tagAdscription)
+      },
+      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];
+            for (var i = 0; i < this.tagTypes.length; i++) {
+              this.tagTypesList.push(this.tagTypes[i].val)
+            }
+          }
+
+        })
+      },
+      getDataList() {
+        const param = this.getFilterItems();
+        api.getModuleInfoList(param).then((res) => {
+          const list = res.data.data.records
+          for (var i = 0; i < list.length; i++) {
+            for (var j =  0; j < this.tagTypes.length; j++) {
+              if(list[i].tagType === this.tagTypes[j].val) {
+                list[i].tagTypeCn = this.tagTypes[j].name;
+              }
+            }
+            for (var z =  0; z < this.Adscriptions.length; z++) {
+              if(list[i].type === this.Adscriptions[z].val) {
+                list[i].typeCn = this.Adscriptions[z].name
+              }
+            }
+
+          }
+          this.list = list;
+          this.total = res.data.data.total;
+          console.log('tagGroup-列表',res)
+        })
+      },
+      filterDatas() {
+        this.currentPage = 1;
+        this.getDataList();
+      },
+      addIndeptTag() {
+        this.$router.push({path:'LT-YXSJWH-TJMBWH'})
+      },
+      modifyIndeptTag(row) {
+        // api.detailsTag({id:row.id,sexType:row.sexType,age:row.age}).then((res)=>{
+        //   const {code,data,msg} = res.data;
+        //   if(code=='0'){
+        //     const item = Object.assign({},row,data);
+        //     this.$router.push({name:'AddIndeptLabel',params:{isEdit:true,data:item}});
+        //   }else{
+        //     this.$message({
+        //       message: msg,
+        //       type: 'warning'
+        //     });
+        //   }
+        // });
+        console.log(row)
+      },
+      currentChange(next) {
+        this.currentPage = next;
+        this.getDataList();
+        // if (this.cacheData[next]) {       //如果已请求过该页数据,则使用缓存不重复请求
+        //     this.list = this.cacheData[next];
+        // } else {
+        //     this.getDataList();
+        // }
+      },
+      getFilterItems() {
+        const param = {
+          // tagTypeList: [1],
+          current: this.currentPage,
+          size: this.pageSize,
+          type: this.filter.tagAdscription,
+          // tagName: this.filter.tagSysName
+        };
+        return param;
+      },
+      indexMethod(index) {
+        return ((this.currentPage - 1) * this.pageSize) + index + 1;
+      },
+      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.deleteTagGroup({ids:id}).then((res)=>{
+            if(res.data.code=='0'){
+              this.getDataList();
+              this.warning(res.data.msg || '操作成功','success');
+            }else{
+              this.warning(res.data.msg);
+            }
+          }).catch((error)=>{
+            this.warning(error);
+          })
+        });
+      }
+    }
+  }
+</script>
+
+
+<style lang="less">
+    .delete{
+        color: red
+    }
+    .delete:hover {
+        color: red;
+    }
+</style>

+ 197 - 0
src/components/icss/TemplateMaintenanceWrap.vue

@@ -0,0 +1,197 @@
+<template>
+  <div class="NoiseTemplateWrapper TemplateWrapper">
+    <div class="groupTitle"><i
+        class="el-icon-back"
+        @click="back"
+      ></i> {{txt}}</div>
+    <PubTemplateGroup
+      :editData="editData"
+      @changeVal="changeVal"
+      @changeType="changeType"
+      @validatePass="validatePass"
+      ref="submitForm"
+    ></PubTemplateGroup>
+    <div class="main">
+      <CommonTemplate
+        v-if="dataPub.region1 == 1" 
+        :pool="dataPub.tagPool"
+        :type="dataPub.region1"
+        :options="editData.questionMapping"
+         @changeActionData="changeActionData"
+      >
+      </CommonTemplate>
+      <div class="btn">
+        <el-button
+          type="primary"
+          @click="submitForm"
+        >确 定</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+/**
+ * dataPub.region2  判断底部显示哪些
+ */
+import PubTemplateGroup from './PubTemplateGroup';
+import CommonTemplate from './CommonTemplate';
+import api from '@api/icss.js';
+import utils from '@api/utils.js';
+
+export default {
+  name: 'TemplateMaintenanceWrap',
+  data() {
+    return {
+      txt:'模板维护--添加模板',
+      dataPub: {},                    //公用组件传的值都在这
+      editData:{},                    //编辑数据
+      form: {
+        currentOrder: '0',            //标签成文顺序
+      },
+      rules: {
+        currentOrder: [
+          { required: true, message: '选择标签成文顺序', trigger: 'change' }
+        ]
+      },
+      sendIds: [[], [], [], [], [], []],           //标签明细右侧操作数据
+    }
+  },
+  beforeMount:function(){
+    const {isEdit,data} = this.$route.params;
+    if(isEdit){
+      this.txt = '模板维护--修改模板';
+      this.editData = data;
+      // console.log('回读数据', this.editData)
+    }
+  },
+  methods: {
+    back() { this.$router.go(-1) },
+    changeVal(val) {    //子组件数据改变传递到父组件
+      this.dataPub = val
+      // console.log('公用组件传的值都在这', val)
+    },
+    changeSex(sex) {       //性别改变,清空标签明细
+      // console.log(sex)
+    },
+    changeType(type) {        //填写单类型改变,标签明细左侧更新,右侧清空
+      // console.log(type)
+    },
+    changeActionData(arr) {          //标签明细右侧数据id
+      this.sendIds = arr
+    },
+    submitForm() {       // 调用子组件的方法验证公用部分
+      this.$refs.submitForm.submitForm('groups');
+    },
+    validatePass() {      //验证成功回调,调取接口
+      //仍需验证标签明细是否选择
+      let type = this.dataPub.region1;
+      if (JSON.stringify(this.sendIds) == '[[],[],[],[],[],[]]' && type != 6 && type != 7 && type != 8) {
+        this.$message({
+          message: '请选择标签明细',
+          type: 'warning'
+        });
+        return;
+      }
+      let detailLis = utils.dataRecombination(this.sendIds, this.dataPub.region2)
+      let param = {
+        "questionWrapper": {
+          "controlType": 0,                            //控件类型(0:默认值 1:下拉单选 2:下拉多选 6:文本框 7:数字键盘文本框 99:联合推送)
+          "id": this.editData.id || '',                //新增id空
+          "type": this.dataPub.region1,                //标签归属
+          // "itemType":0,                                //0:是症状,1:不是症状
+          "tagType": this.dataPub.region2,             //标签类型
+          "tagName": this.dataPub.region3,             //系统名称
+          "name": this.dataPub.region4,                //界面名称
+          "joint": this.dataPub.region5,               //标签间的连接符
+          "subType": this.dataPub.region6,   	         //0:可以,1:不可以(当项目检索)
+          "sexType": this.dataPub.region7,             //1:男,2:女,3:通用
+          "ageBegin": this.dataPub.region8,       		 //最小年龄
+          "ageEnd": this.dataPub.region9,              //最大年龄
+          "textGenerate": this.form.currentOrder,      //成文顺序 默认0
+          "copyType": this.dataPub.region10,           //是否复制
+          "showAdd": this.dataPub.region11,            //是否显示加号血压
+          "showInfo": 0,
+          "questionDetails": [],
+          "questionMappings": detailLis       //映射关系,
+        }
+      }
+      this.showDelDialog(param)
+    },
+    showDelDialog(param) {
+      this.showConfirmDialog('是否保存该标签组?', () => {
+        api.saveOrUpdate(param).then((res) => {
+          if (res.data.code === '0') {
+            this.warning(res.data.msg || '保存成功', 'success','1000')
+            setTimeout(() => {
+              this.$router.push({
+                path:'/admin/LT-YXSJWH-BQZWH'
+              })
+            }, 1000);
+          } else {
+            this.warning(res.data.msg)
+          }
+        }).catch((err) => {
+          this.warning(err);
+        })
+      });
+    },
+    showConfirmDialog(msg, resolve) {
+      this.$alert(msg, '提示', {
+        confirmButtonText: '确定',
+        type: 'warning'
+      }).then(() => {
+        resolve();
+      }).catch(() => {});
+    },
+    warning(msg, type,time) {
+      this.$message({
+        showClose: true,
+        message: msg,
+        type: type || 'warning',
+        duration:time || '3000'
+      })
+    },
+  },
+  components: {
+    PubTemplateGroup,
+    CommonTemplate,
+  }
+}
+</script>
+<style lang="less">
+@import "../../less/common.less";
+.NoiseTemplateWrapper {
+  .groupTitle {
+    background-color: #fff;
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+  }
+  .main {
+    background-color: #fff;
+    margin: 0 20px 20px;
+    padding: 20px;
+    border-top: 1px solid @icssBorder;
+    box-sizing: border-box;
+    font-size: 14px;
+    color: #606266;
+    .title {
+      margin-bottom: 20px;
+      i {
+        color: #f56c6c;
+      }
+    }
+  }
+  .btn {
+    text-align: right;
+  }
+  .order {
+    margin-bottom: 20px;
+    .el-input__inner {
+      line-height: 30px;
+      height: 30px;
+    }
+  }
+}
+</style>
+

+ 23 - 2
src/routes.js

@@ -29,7 +29,7 @@ import AddOrganization from '@components/admin/AddOrganization.vue';//添加机
 import ModifinedOrga from '@components/admin/ModifinedOrga.vue';//修改机构信息
 import ProductDetail from '@components/admin/ProductDetail.vue';
 import Console from '@components/user/Console.vue';
-import LabelGroup from '@components/icss/LabelGroup.vue'
+import LabelGroup from '@components/icss/LabelGroup.vue'  //标签组
 import NoiseTemplate from '@components/icss/NoiseTemplate.vue';
 import DeptInfo from '@components/icss/DeptInfo.vue';//科室信息
 import DeptInfoDetail from '@components/icss/DeptInfoDetail.vue';//科室信息-详情
@@ -40,9 +40,20 @@ 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 CommonSymptom from '@components/icss/CommonSymptom.vue' //常见科室症状
+import AddCommonSymptom from '@components/icss/AddCommonSymptom' //常见科室症状--添加
+import PromptDetail from '@components/icss/PromptDetail.vue'//提示信息详情
+import MedicinePrompt from '@components/icss/MedicinePrompt.vue'   //医学术语静态知识
+import AddMedicinePrompt from '@components/icss/AddMedicinePrompt.vue'   //医学术语静态知识
+
 import DisclaimerInformation from '@components/icss/DisclaimerInformation.vue'//免责声明
 import DiscInfoDetail from '@components/icss/DiscInfoDetail.vue'//免责声明-详情
 import AddDisclInfo from '@components/icss/AddDisclInfo.vue'//免责声明-添加
+import PhysicalExamTemplate from '@components/icss/PhysicalExamTemplate.vue'  //查体模板维护
+import AddPhysicalExamTemp from '@components/icss/AddPhysicalExamTemp.vue'  //查体模板维护--添加
+
+import TemplateMaintenance from '@components/icss/TemplateMaintenance.vue'//模板维护列表
+import TemplateMaintenanceWrap from '@components/icss/TemplateMaintenanceWrap.vue'//模板维护添加修改
 import VersionInfo from '@components/icss/VersionInfo.vue'//版本信息
 import VersionDetail from '@components/icss/VersionDetail.vue'//版本信息-详情
 import AddVersion from '@components/icss/AddVersion.vue'//版本信息-添加/修改
@@ -153,13 +164,23 @@ export default [
       {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-CJZZWH',component:CommonSymptom,name:'CommonSymptom'},  //常见症状维护
+      {path:'LT-YXSJWH-TJCJZZ',component:AddCommonSymptom,name:'AddCommonSymptom'},  //常见症状维护--添加
       {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'},     //免责声明-添加/修改
-      {path:'LT-YXSJWH-BBXXWH',component:VersionInfo,name:'VersionInfo'},     //版本信息
+      {path:'LT-YXSJWH-MBWH',component:TemplateMaintenance,name:'TemplateMaintenance'},     //模板维护
+      {path:'LT-YXSJWH-CTBQWH',component:PhysicalExamTemplate,name:'PhysicalExamTemplate'},     //查体模板维护
+      {path:'LT-YXSJWH-TJCTMB',component:AddPhysicalExamTemp,name:'AddPhysicalExamTemp'},     //查体模板维护
+      {path:'LT-YXSJWH-TJMBWH',component:TemplateMaintenanceWrap,name:'TemplateMaintenanceWrap'},     //模板维护-添加修改
+      {path:'LT-YXSJWH-TSXXXQ',component:PromptDetail,name:'PromptDetail'},         //提示信息维护详情
+      {path:'LT-YXSYKWH-YXSYJTZSWH',component:MedicinePrompt,name:'MedicinePrompt'},         //医学术语提示信息维护
+      {path:'LT-YXSYKWH-TJYXSYJTZS',component:AddMedicinePrompt,name:'AddMedicinePrompt'},         //医学术语提示信息维护添加
+	  {path:'LT-YXSJWH-BBXXWH',component:VersionInfo,name:'VersionInfo'},     //版本信息
       {path:'LT-YXSJWH-BBXXXQ',component:VersionDetail,name:'VersionDetail'},     //版本信息-详情
       {path:'LT-YXSJWH-TJBBXX',component:AddVersion,name:'AddVersion'},     //版本信息-添加/修改
+
     ]
   }
 ]