Skip to content

P
pica.cloud.web-education-admin
提交 1cd22ccb 编写于 作者: tao.wu's avatar tao.wu
浏览文件
操作

Merge branch 'dev-followUp-20190312' of... 

Merge branch 'dev-followUp-20190312' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312
上级 88f80c35 ebd35335
显示空白字符变更
内嵌 并排
正在显示 包含 257 行增加 和 978 行删除
.DS_Store 已删除 100644 → 0
浏览文件 @ 88f80c35
文件已删除
.gitignore
浏览文件 @ 1cd22ccb
......@@ -6,4 +6,5 @@ dist/
/yqy/
node_modules/
.DS_Store
.vscode
.vscode/
.idea/
.idea/workspace.xml 已删除 100644 → 0
浏览文件 @ 88f80c35
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="6ce82120-a8ee-450b-b158-903e9e14a6ba" name="Default" comment="" />
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="reservation-list.vue" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/views/followup/reservation-manage/reservation-list.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3864">
<caret line="135" column="17" lean-forward="false" selection-start-line="135" selection-start-column="17" selection-end-line="135" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="resident-list.vue" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/views/followup/plan-manage/resident-list.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="87" column="26" lean-forward="false" selection-start-line="87" selection-start-column="26" selection-end-line="87" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="mock.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/views/mock.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="354">
<caret line="128" column="2" lean-forward="false" selection-start-line="128" selection-start-column="2" selection-end-line="128" selection-end-column="2" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="envConfig.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utils/envConfig.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="20" column="8" lean-forward="false" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="followapis.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utils/followup/followapis.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="38" column="30" lean-forward="false" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="30" />
<folding>
<element signature="e#0#29#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="reservationManage.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/store/modules/followup/reservationManage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="32" column="23" lean-forward="false" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="planManage.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/store/modules/followup/planManage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="32" column="36" lean-forward="false" selection-start-line="32" selection-start-column="36" selection-end-line="32" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="change-reservation.vue" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/views/followup/reservation-manage/dialog/change-reservation.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="49" column="49" lean-forward="false" selection-start-line="49" selection-start-column="49" selection-end-line="49" selection-end-column="49" />
<folding>
<element signature="e#2786#3756#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="send-reservation.vue" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/views/followup/reservation-manage/dialog/send-reservation.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" column="6" lean-forward="false" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
<folding>
<element signature="n#style#0;n#div#0;n#el-form-item#1;n#el-form#0;n#el-dialog#0;n#div#0;n#template#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#el-select#0;n#el-form-item#1;n#div#0;n#el-form-item#1;n#el-form#0;n#el-dialog#0;n#div#0;n#template#0;n#!!top" expanded="true" />
<element signature="e#3150#4120#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>labelWidth</find>
<find>hasSmsBalance</find>
<find>closeDetail</find>
<find>pickerOptions</find>
<find>wechatNumber</find>
<find>timeRange</find>
<find>no-enough-content</find>
<find>reservationDialog</find>
<find>isDialogShow</find>
<find>closeSendReserve1</find>
<find>warn-tips</find>
<find>closeSendReserve</find>
<find>reservationForm</find>
<find>goPatientDetail</find>
<find>searchReservationList</find>
<find>resetSearchData</find>
<find>resetFields</find>
<find>handleSelectionChange</find>
<find>selectionData</find>
<find>sendReservation</find>
<find>mapState</find>
<find>getConfigByEnvType</find>
<find>reservationManage</find>
<find>status</find>
<find>mock</find>
<find>followUpApiSoSoApi</find>
<find>setSearchData</find>
<find>mapAc</find>
<find>getReservationList</find>
<find>reservationList</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="release" />
</map>
</option>
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/config/index.js" />
<option value="$PROJECT_DIR$/src/router/follow.js" />
<option value="$PROJECT_DIR$/src/views/followup/recordManage/record-list.vue" />
<option value="$PROJECT_DIR$/src/style/followup/followup-common.scss" />
<option value="$PROJECT_DIR$/src/components/followup/customTextarea.vue" />
<option value="$PROJECT_DIR$/src/components/followup/followupDetail.vue" />
<option value="$PROJECT_DIR$/src/views/followup/plan-manage/plan-list.vue" />
<option value="$PROJECT_DIR$/src/views/followup/record-manage/record-list.vue" />
<option value="$PROJECT_DIR$/src/views/followup/reservation-manage/dialog/no-enough.vue" />
<option value="$PROJECT_DIR$/src/style/followup/element-reset.css" />
<option value="$PROJECT_DIR$/src/App.vue" />
<option value="$PROJECT_DIR$/src/views/followup/reservation-manage/dialog/send-reservation.vue" />
<option value="$PROJECT_DIR$/src/utils/fetch.js" />
<option value="$PROJECT_DIR$/src/views/followup/reservation-manage/dialog/change-reservation.vue" />
<option value="$PROJECT_DIR$/src/utils/followup/followapis.js" />
<option value="$PROJECT_DIR$/src/store/modules/followup/reservationManage.js" />
<option value="$PROJECT_DIR$/src/views/followup/reservation-manage/reservation-list.vue" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER">
<package-json value="$PROJECT_DIR$/package.json" />
</component>
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-468" />
<option name="y" value="-1448" />
<option name="width" value="2064" />
<option name="height" value="1128" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
<manualOrder />
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="pica.cloud.web-education-admin" type="b2602c69:ProjectViewProjectNode" />
<item name="pica.cloud.web-education-admin" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../ogre-renderer" />
<property name="HbShouldOpenHtmlAsHb" value="" />
<property name="settings.editor.selected.configurable" value="preferences.general" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\projects\pica.cloud.web-education-admin\src\views\followup\reservation-manage\dialog" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\projects\pica.cloud.web-education-admin\src\views\followup\record-manage\dialog" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="6ce82120-a8ee-450b-b158-903e9e14a6ba" name="Default" comment="" />
<created>1552442106311</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1552442106311</updated>
<workItem from="1552442107600" duration="11807000" />
<workItem from="1552528000917" duration="73343000" />
<workItem from="1552876863679" duration="33659000" />
<workItem from="1552978232815" duration="16294000" />
</task>
<task id="LOCAL-00001" summary="录入列表">
<created>1552468896598</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1552468896598</updated>
</task>
<task id="LOCAL-00002" summary="录入列表11">
<created>1552545442865</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1552545442865</updated>
</task>
<task id="LOCAL-00003" summary="录入列表调整">
<created>1552550084234</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1552550084234</updated>
</task>
<task id="LOCAL-00004" summary="录入列表样式调整">
<created>1552553105428</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1552553105428</updated>
</task>
<task id="LOCAL-00005" summary="录入列表样式调整1">
<created>1552555450237</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1552555450237</updated>
</task>
<task id="LOCAL-00006" summary="录入列表样式调整2">
<created>1552555897451</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1552555897451</updated>
</task>
<task id="LOCAL-00007" summary="录入列表样式调整3">
<created>1552615648060</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1552615648060</updated>
</task>
<task id="LOCAL-00008" summary="录入列表样式调整3">
<created>1552621826607</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1552621826607</updated>
</task>
<task id="LOCAL-00009" summary="录入列表样式调整4">
<created>1552626028679</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1552626028679</updated>
</task>
<task id="LOCAL-00010" summary="更改随访状态页面">
<created>1552642889743</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1552642889743</updated>
</task>
<task id="LOCAL-00011" summary="随访详情页面添加">
<created>1552721004791</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1552721004791</updated>
</task>
<task id="LOCAL-00012" summary="添加计划列表页面">
<created>1552729637283</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1552729637283</updated>
</task>
<task id="LOCAL-00013" summary="发送预约页面">
<created>1552912332369</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1552912332369</updated>
</task>
<task id="LOCAL-00014" summary="更改预约状态页面">
<created>1552974137617</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1552974137617</updated>
</task>
<task id="LOCAL-00015" summary="调试发送预约校验接口">
<created>1552998768520</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1552998768520</updated>
</task>
<task id="LOCAL-00016" summary="m">
<created>1552999183545</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1552999183545</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="135103000" />
</component>
<component name="ToolWindowManager">
<frame x="-468" y="-1448" width="2064" height="1128" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3521695" sideWeight="0.53060216" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3521695" sideWeight="0.46939784" order="8" side_tool="false" content_ui="tabs" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21089809" sideWeight="0.48075023" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1816387" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="1" />
<option value="2" />
<option value="3" />
</list>
</option>
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="录入列表" />
<MESSAGE value="录入列表11" />
<MESSAGE value="录入列表调整" />
<MESSAGE value="录入列表样式调整" />
<MESSAGE value="录入列表样式调整1" />
<MESSAGE value="录入列表样式调整2" />
<MESSAGE value="录入列表样式调整3" />
<MESSAGE value="录入列表样式调整4" />
<MESSAGE value="更改随访状态页面" />
<MESSAGE value="随访详情页面添加" />
<MESSAGE value="添加计划列表页面" />
<MESSAGE value="发送预约页面" />
<MESSAGE value="更改预约状态页面" />
<MESSAGE value="调试发送预约校验接口" />
<MESSAGE value="冲突解决" />
<MESSAGE value="merge" />
<MESSAGE value="m" />
<option name="LAST_COMMIT_MESSAGE" value="m" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="2" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/config/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="32" column="16" lean-forward="true" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/common/svg.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/education/create-component.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8350">
<caret line="334" column="12" lean-forward="false" selection-start-line="334" selection-start-column="12" selection-end-line="334" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/education/item-manager.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2908">
<caret line="193" column="25" lean-forward="true" selection-start-line="193" selection-start-column="25" selection-end-line="193" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/education/add-manager.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-500">
<caret line="1" column="30" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/breadcrumb.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="28" column="14" lean-forward="true" selection-start-line="28" selection-start-column="14" selection-end-line="28" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build/webpack.base.conf.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="12" lean-forward="false" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/recordManage/record-list.vue" />
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="24" column="26" lean-forward="false" selection-start-line="24" selection-start-column="26" selection-end-line="24" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/utils.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2400">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/followup/customTextarea.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="11" lean-forward="true" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/education/item-component.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4300">
<caret line="41" column="49" lean-forward="false" selection-start-line="41" selection-start-column="49" selection-end-line="41" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/style/global.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="11" lean-forward="false" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/assets/image/small.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/assets/image/no-content.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/assets/image/menu2.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/assets/image/menu1.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/assets/image/img.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/assets/image/footer-icon.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/assets/image/index_logoicon.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/assets/image/noData.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/plan-manage/dialog/finish-followup.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1718">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/plan-manage/resident-detail.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1578">
<caret line="100" column="46" lean-forward="false" selection-start-line="100" selection-start-column="46" selection-end-line="100" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/plan-manage/dialog/change-plan.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1000">
<caret line="84" column="16" lean-forward="false" selection-start-line="84" selection-start-column="6" selection-end-line="84" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/style/followup/followup-common.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="10" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/style/common.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="150" column="1" lean-forward="true" selection-start-line="150" selection-start-column="1" selection-end-line="150" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/style/followup/element-reset.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250">
<caret line="50" column="1" lean-forward="true" selection-start-line="50" selection-start-column="1" selection-end-line="50" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/App.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1217">
<caret line="60" column="37" lean-forward="true" selection-start-line="60" selection-start-column="37" selection-end-line="60" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/reservation-manage/dialog/no-enough.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="44" lean-forward="true" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/plan-manage/plan-list.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-50">
<caret line="22" column="14" lean-forward="false" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" />
<folding>
<element signature="n#style#0;n#el-input#0;n#el-form-item#0;n#el-form#0;n#div#0;n#div#1;n#div#0;n#div#0;n#template#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#el-select#0;n#el-form-item#1;n#el-form#0;n#div#0;n#div#1;n#div#0;n#div#0;n#template#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#el-table#0;n#div#1;n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#template#0;n#el-table-column#0;n#el-table#0;n#div#1;n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" expanded="false" />
<element signature="e#3793#3906#0" expanded="false" />
<element signature="e#3952#3987#0" expanded="false" />
<element signature="e#4003#4087#0" expanded="false" />
<element signature="e#4213#4238#0" expanded="false" />
<element signature="e#4459#4562#0" expanded="false" />
<element signature="e#4601#4658#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/record-manage/record-list.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="99" column="142" lean-forward="false" selection-start-line="99" selection-start-column="12" selection-end-line="99" selection-end-column="142" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/reservation-manage/dialog/send-reservation.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" column="6" lean-forward="false" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
<folding>
<element signature="n#style#0;n#div#0;n#el-form-item#1;n#el-form#0;n#el-dialog#0;n#div#0;n#template#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#el-select#0;n#el-form-item#1;n#div#0;n#el-form-item#1;n#el-form#0;n#el-dialog#0;n#div#0;n#template#0;n#!!top" expanded="true" />
<element signature="e#3150#4120#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/record-manage/dialog/followupDetail.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="706">
<caret line="38" column="51" lean-forward="true" selection-start-line="38" selection-start-column="51" selection-end-line="38" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/home.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="37" column="67" lean-forward="true" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/reservation-manage/dialog/change-reservation.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="49" column="49" lean-forward="false" selection-start-line="49" selection-start-column="49" selection-end-line="49" selection-end-column="49" />
<folding>
<element signature="e#2786#3756#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="169" column="27" lean-forward="false" selection-start-line="169" selection-start-column="27" selection-end-line="169" selection-end-column="27" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/followup/followupUtils/dataConverter.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/followup/followupUtils/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/router/follow.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1400">
<caret line="7" column="6" lean-forward="false" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/store/modules/common.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="21" column="1" lean-forward="true" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/store/getters.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/store/modules/followup/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#37#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/store/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#21#0" expanded="false" />
<element signature="e#89#141#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/mock.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="354">
<caret line="128" column="2" lean-forward="false" selection-start-line="128" selection-start-column="2" selection-end-line="128" selection-end-column="2" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/envConfig.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="20" column="8" lean-forward="false" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/followup/followapis.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="38" column="30" lean-forward="false" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="30" />
<folding>
<element signature="e#0#29#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/store/modules/followup/reservationManage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="32" column="23" lean-forward="false" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/reservation-manage/reservation-list.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3864">
<caret line="135" column="17" lean-forward="false" selection-start-line="135" selection-start-column="17" selection-end-line="135" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/views/followup/plan-manage/resident-list.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="87" column="26" lean-forward="false" selection-start-line="87" selection-start-column="26" selection-end-line="87" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/fetch.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="20" column="11" lean-forward="false" selection-start-line="20" selection-start-column="11" selection-end-line="20" selection-end-column="11" />
<folding>
<element signature="e#0#25#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/store/modules/followup/planManage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="32" column="36" lean-forward="false" selection-start-line="32" selection-start-column="36" selection-end-line="32" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
.vscode/settings.json 已删除 100644 → 0
浏览文件 @ 88f80c35
{
"editor.fontSize": 15
}
\ No newline at end of file
src/App.vue
浏览文件 @ 1cd22ccb
......@@ -48,7 +48,7 @@ export default {
},
created() {
vm = this
vm.getToken()
// vm.getToken()
},
mounted() {
......
src/store/followup/reservationManage.js
浏览文件 @ 1cd22ccb
......@@ -17,7 +17,7 @@ export default {
},
mutations: {
GET_RESERVATION_LIST(state, payload) {
state.reservationList = payload.data.enteringDtos
state.reservationList = payload;
},
GET_CHECK_RESERVATION(state, payload) {
state.checkRevervationData = payload
......
src/store/followup/workbench.js
浏览文件 @ 1cd22ccb
......@@ -9,22 +9,11 @@ export default {
},
mutations: {
GET_TODAY_PLAN_LIST(state, payload) {
// state.todayPlansList = payload.data
state.todayPlansList = [
{
patientName: 'wewe',
status: 1,
appointTime: '2019-03-05'
}
]
console.log('返回数据', payload)
state.todayPlansList = payload
},
GET_TODAY_APPOINTS_LIST(state, payload) {
state.todayAppointsList = [
{
planName: 'wewe',
appointTime: '2019-03-05'
}
]
state.todayAppointsList = payload
},
GET_TODAY_OVERVIEW(state, payload) {
state.todayOverview = payload
......
src/utils/fetch.js
浏览文件 @ 1cd22ccb
......@@ -14,7 +14,7 @@ service.interceptors.request.use(config => {
if( config.headers['sysCode']==undefined) {
config.headers['sysCode'] = 12
}
config.headers['token'] = 'B19ABBCB6B7A4B6F887A1ED6BCB69FD6'
config.headers['token'] = 'D74A6C7C61564EB1B3DC83251F33D173'
//config.headers['token'] = localStorage.getItem('storageToken')
config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
// if (config.data && config.data.setEntry) {
......
src/utils/followup/followapis.js
浏览文件 @ 1cd22ccb
......@@ -7,9 +7,9 @@ import utils from './followupUtils';
const headers = null /*{
const headers = {
sysCode: 45
}*/
} /**/
/*工作台*/
export const getTodayAppointsList = (params) => {
return fetch({
......
src/views/followup/plan-manage/dialog/recover-followup.vue 0 → 100644
浏览文件 @ 1cd22ccb
<template>
<div class="finish-followup" v-if="showThisPage">
<el-dialog
title="恢复随访"
:visible.sync="showFinishFollowup"
v-if="showThisPage"
:before-close="clickClose"
width="30%"
center>
<div class="finish-content">
<el-form
:model="recoverData"
:rules="rules"
label-width="100px">
<el-form-item label="居民：">
{{recoverData.patientName}}
</el-form-item>
<el-form-item label="恢复原因：" prop="finishReason">
<el-input
type="textarea"
v-model="recoverData.finishReason"
placeholder="请输入原因"
maxlength="30"
rows="3"
resize="none"></el-input>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="button-green" @click="clickClose" size="small" type="primary">取 消</el-button>
<el-button class="button-white" @click="clickClose" size="small" plain>确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
name: "recover-followup",
props: {
showThisPage: { //是否显示model
type: Boolean,
default: function () {
return false;
}
},
recoverData: {
type: Object,
default: function () {
return {};
}
}
},
data() {
return {
showFinishFollowup: true,
rules: {
recoverData: [
{ required: true, message: '请输入恢复原因', trigger: 'blur' },
{ min: 1, max: 30, message: '长度在30个字符内', trigger: 'blur' }
],
}
}
},
methods: {
clickClose() {
this.$emit('closeRecoverFollowup',false)
},
}
}
</script>
<style scoped>
.el-input__inner:disabled {
background-color: #ffffff!important;
}
</style>
<style lang="scss" scoped>
@import '../../../../style/followup/followup-common';
@import '../../../../style/followup/element-reset.css';
</style>
src/views/followup/plan-manage/plan-detail.vue
浏览文件 @ 1cd22ccb
......@@ -53,17 +53,17 @@
<div class="followup-contents">
<div class="content-div">
<div class="c-title">随访方式：</div>
<div class="c-content">{{nodeContent.typeStr}}</div>
<div class="c-content">{{nodeContent[0].typeStr}}</div>
</div>
<div class="content-div">
<div class="c-title">提醒医生预约居民：</div>
<div class="c-content more-content">
<p v-for="item in nodeContent.remindList">{{item.startDaysStr}}</p>
<p v-for="item in nodeContent[0].remindList">{{item.startDaysStr}}</p>
</div>
</div>
<div class="content-div">
<div class="c-title">推送患教：</div>
<div class="c-content more-content" v-for="item in nodeContent.pushContentList">
<div class="c-content more-content" v-for="item in nodeContent[0].pushContentList">
<p>{{item.startDaysStr}} <span class="click-text" >《{{item.sendContent}}》</span></p>
<p class="reminding">推送规则：优先微信推送，如果居民没关注云鹊医公众号，将短信推送，短信推送会消耗您的额度。推送详情请前往云鹊医app患教中心查询</p>
</div>
......@@ -71,7 +71,7 @@
<div class="content-div">
<div class="c-title">随访登记表：</div>
<div class="c-content more-content">
<p class="click-text" v-for="item in nodeContent.followupList" >{{item.sendContent}}</p>
<p class="click-text" v-for="item in nodeContent[0].followupList" >{{item.sendContent}}</p>
</div>
</div>
</div>
......@@ -104,6 +104,7 @@
timeNodes: null,//时间节点
showFollowTime: false, //是否展示全部时间
thisNodeContents: {},
nodeContent: {}, //节点详情
}
},
created() {
......@@ -118,7 +119,6 @@
residentDetail: state => state.residentDetail,
planDetail: state => state.planDetail,
nodeTimeList: state => state.nodeTimeList,
nodeContent: state => state.nodeContent
})
},
methods: {
......@@ -141,7 +141,10 @@
this.timeNodes = val.fPlanTimeDtoList[0].id
},
timeNodes(val) {
this.getNodeTimeContent(val)
this.nodeContent = this.planDetail.fPlanTimeDtoList.filter(function(item){
return item.id == val;
})
console.log('this.nodeContent',this.nodeContent[0])
}
}
}
......
src/views/followup/plan-manage/plan-list.vue
浏览文件 @ 1cd22ccb
......@@ -11,7 +11,7 @@
</el-form-item>
<el-form-item label="开始年份">
<el-select v-model="searchData.startYear" placeholder="请选择时间范围" style="width: 250px">
<el-option label="全部" value="0"></el-option>
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item,index) in timeRangeList"
:key="item.value"
......@@ -78,15 +78,50 @@
curmbSecond: '计划管理',
searchData: {
name: '',
startYear: '0',
startYear: '',
},
timeRangeList:[{
timeRangeList:[
{
label: '2018年',
value: 0
}, {
label: '2019年',
value: 1
},{
label: '2018年',
label: '2020年',
value: 2
}],
}, {
label: '2021年',
value: 3
},{
label: '2022年',
value: 4
},{
label: '2023年',
value: 5
},{
label: '2024年',
value: 6
},{
label: '2025年',
value: 7
},{
label: '2026年',
value: 8
},{
label: '2027年',
value: 9
},{
label: '2028年',
value: 10
},{
label: '2029年',
value: 11
},{
label: '2030年',
value: 12
}
],
paginationSet: {
pageNo: 1,
pageSize: 10,
......
src/views/followup/plan-manage/plan-modify.vue
浏览文件 @ 1cd22ccb
......@@ -48,7 +48,7 @@
</el-form-item>
</el-form>
<div class="edit-plan-content">
<set-time-node ></set-time-node>
<set-time-node :setTimeNodeList="setTimeNodeList" @setTimeNodeListOnCom="setTimeNodeListOnCom"></set-time-node>
</div>
</div>
<select-patient
......@@ -106,6 +106,7 @@
isShowSelectPatient: false, //显示居民选择框
isShowSelectedDialog: false, //显示已选居民
hasSelectedList: [], //已选居民
nodeListModify: [], //修改node列表
showFollowTime: false, //是否展示全部时间
}
},
......@@ -123,11 +124,12 @@
planDetail: state => state.planDetail,
nodeTimeList: state => state.nodeTimeList,
residentList: state => state.residentList,
remarkOption: state => state.remarkOption
remarkOption: state => state.remarkOption,
setTimeNodeList: state => state.setTimeNodeList
})
},
methods: {
...mapActions('planManage', ['getPlanDetail', 'getNodeTimeList', 'getResidentList', 'getRemarkOption']),
...mapActions('planManage', ['getPlanDetail', 'getNodeTimeList', 'getResidentList', 'getRemarkOption', 'getTimeNodeList']),
selectPatientHandler() {
this.isShowSelectPatient = true;
},
......@@ -185,7 +187,16 @@
closeFollowTime(isShow) {
this.showFollowTime = isShow
},
setTimeNodeListOnCom(val){
this.getTimeNodeList(val)
},
},
watch: {
planDetail(val) {
// this.setTimeNodeList = val.fPlanTimeDtoList
this.setTimeNodeListOnCom(val.fPlanTimeDtoList)
}
}
}
</script>
......
src/views/followup/plan-manage/resident-list.vue
浏览文件 @ 1cd22ccb
......@@ -51,7 +51,8 @@
<el-radio-button label="2">已结束({{residentList.yesCount}})</el-radio-button>
</el-radio-group>
<div class="btn-left">
<el-button class="button-green" type="primary" size="small" @click="finishFollowup('all')">结束随访</el-button>
<el-button class="button-green" type="primary" size="small" v-if="status==2" @click="recoverFollowup('all')">恢复随访</el-button>
<el-button class="button-green" type="primary" size="small" v-else @click="finishFollowup('all')">结束随访</el-button>
<el-button class="button-white" plain size="small" @click="selectPatientHandler">添加居民</el-button>
</div>
</div>
......@@ -100,7 +101,8 @@
align="center">
<template slot-scope="scope">
<el-button class="btn-right-class" type="text" @click="changePlan(scope.row)" >变更计划</el-button>|
<el-button class="btn-right-class" type="text" @click="finishFollowup(scope.row)" >结束随访</el-button>
<el-button class="btn-right-class" type="text" v-if="status==2" @click="recoverFollowup(scope.row)" >恢复随访</el-button>
<el-button class="btn-right-class" type="text" v-else @click="finishFollowup(scope.row)" >结束随访</el-button>
</template>
</el-table-column>
</el-table>
......@@ -121,6 +123,7 @@
</div>
<change-plan :showThisPage="showChangePlan" :planChangeData="planChangeData" @closeChangePlan="closeChangePlan"></change-plan>
<finish-followup :showThisPage="showFinishFollowup" :finishData="finishData" @closeFinishFollowup="closeFinishFollowup"></finish-followup>
<recover-followup :showThisPage="showRecoverFollowup" :finishData="recoverData" @closeFinishFollowup="closeRecoverFollowup"></recover-followup>
<select-patient
:isShowSelectPatient="isShowSelectPatient"
@closeSelectPatient="closeSelectPatient"
......@@ -135,6 +138,8 @@
import ChangePlan from '@/views/followup/plan-manage/dialog/change-plan';
//结束随访dialog
import FinishFollowup from '@/views/followup/plan-manage/dialog/finish-followup';
//恢复随访dialog
import RecoverFollowup from '@/views/followup/plan-manage/dialog/finish-followup';
//添加居民
import SelectPatient from '@/views/followup/plan-manage/dialog/select-patient';
......@@ -145,7 +150,8 @@
BreadCrumb,
ChangePlan,
FinishFollowup,
SelectPatient
SelectPatient,
RecoverFollowup
},
data() {
return {
......@@ -166,6 +172,8 @@
planChangeData: {}, //变更计划数据
showFinishFollowup: false, //是否展示结束随访
finishData: {}, //结束数据
showRecoverFollowup: false, //是否展示恢复随访
recoverData: {}, //恢复数据
isShowSelectPatient: false, //显示居民选择框
hasSelectedList: [], //已选居民
finishPatientList: [], //结束随访居民（多选）
......@@ -254,6 +262,29 @@
closeFinishFollowup(isShow) {
this.showFinishFollowup = isShow
},
recoverFollowup(row) {
if(row=='all') {
if(this.finishPatientList.length<=0) {
this.$message({
message: '请选择居民！',
type: 'warning'
});
return;
}
this.finishData = {
patientName: row.patientName,
};
} else {
this.finishData = {
patientName: row.patientName,
};
}
this.showFinishFollowup = true;
},
closeRecoverFollowup(isShow) {
this.showRecoverFollowup = isShow
},
selectPatientHandler() {
this.isShowSelectPatient = true;
},
......
src/views/followup/record-manage/dialog/change-followup-status.vue
浏览文件 @ 1cd22ccb
......@@ -67,20 +67,18 @@
if (valid) {
//后面更改为接口调用
changeEnteringStatus({
info: {
fuPlanPatientTimesId: this.statusForm.fuPlanPatientTimesId,
patientId: this.statusForm.patientId,
status: this.statusForm.status,
status: (this.statusForm.status == 1 ? 2 : 1),
reason: this.statusForm.reason,
}
}).then(({data}) => {
if(data == 1) {
if(data == 2) {
this.$message.success('随访状态变更成功!');
this.$emit('closeChangeStatus',false);
this.$refs['statusForm'].resetFields();
}else {
return;
this.$message.error('随访状态变更失败!');
}
this.$emit('closeChangeStatus',false);
this.$refs['statusForm'].resetFields();
})
} else {
return false;
......
src/views/followup/record-manage/record-list.vue
浏览文件 @ 1cd22ccb
......@@ -36,11 +36,11 @@
</div>
<div class="table-content">
<el-radio-group v-model="activeName" @change="handlerClick" size="small">
<el-radio-button label="0">全部（{{recordList.count}}）</el-radio-button>
<el-radio-button label="1">已完成（{{recordList.acceptCount}}）</el-radio-button>
<el-radio-button label="2">未完成（{{recordList.refuseCount}}）</el-radio-button>
<el-radio-button label="">全部({{recordList.count}})</el-radio-button>
<el-radio-button label="2">已完成({{recordList.finishedCount}})</el-radio-button>
<el-radio-button label="1">未完成({{recordList.unfinishedCount}})</el-radio-button>
</el-radio-group>
<el-table :data="recordList.fuPlanInfoList" style="width: 100%;margin-top: 20px;">
<el-table :data="recordList.enteringDtos" style="width: 100%;margin-top: 20px;">
<el-table-column prop="nickname" label="姓名" min-width="100" align="center">
<template slot-scope="scope">
<span style="cursor: pointer" @click="visitDetail(scope.row)">{{scope.row.nickname}}</span>
......@@ -71,7 +71,7 @@
<el-row type="flex" justify="end" class="margin-top20">
<el-pagination
background
v-if="recordList.fuPlanInfoList"
v-if="recordList.enteringDtos"
@size-change="handleSizeChangePre"
@current-change="handleCurrentChangePre"
layout="total, sizes, prev, pager, next, jumper"
......@@ -112,7 +112,7 @@
nickname: '',
mobilePhone: ''
},
activeName: 0,
activeName: '',
paginationSet: {
pageNo: 1,
pageSize: 10,
......@@ -146,30 +146,31 @@
// ...mapActions('reservationManage', ['getConstantsData']),
...mapActions('recordManage', ['getRecordList', 'getEnteringInfo']),
async search(currentPage){
if(this.timeRangeList.length>0) {
if(this.timeRangeList) {
this.searchData.beginTime = this.timeRangeList[0];
this.searchData.endTime = this.timeRangeList[1];
}else {
this.searchData.beginTime = '';
this.searchData.endTime = '';
}
await this.getRecordList({
info: {
...this.searchData,
status: this.activeName,
pageNo: currentPage || this.paginationSet.pageNo,
pageSize: this.paginationSet.pageSize,
},
});
const {pageNo, pageSize, count, acceptCount, refuseCount} = this.recordList;
if(this.activeName == 0){
const {pageNo, pageSize, count, finishedCount, unfinishedCount} = this.recordList;
if(this.activeName == ''){
this.paginationSet.total = count;
}else if(this.activeName == 2){
this.paginationSet.total = finishedCount;
}else if(this.activeName == 1){
this.paginationSet.total = acceptCount;
}else {
this.paginationSet.total = refuseCount;
this.paginationSet.total = unfinishedCount;
}
this.paginationSet = {
...this.paginationSet,
pageNo,
pageSize: 10,
pageSize: pageSize,
}
},
reseat(){
......@@ -177,11 +178,12 @@
this.searchData.nickname = '';
this.searchData.mobilePhone = '';
this.timeRangeList = [];
this.searchData.beginTime = '';
this.searchData.endTime = '';
this.search(1);
},
async visitDetail(row){
await this.getEnteringInfo({patientId:row.patientId,fuPlanPatientTimesId:row.fuPlanPatientTimesId});
//await this.getEnteringInfo({});
this.dialogDetailShow = true;
// this.enteringRow = row;
......
src/views/followup/reservation-manage/reservation-list.vue
浏览文件 @ 1cd22ccb
......@@ -9,18 +9,18 @@
<div class="search-div">
<div class="search-input">
<el-form :model="searchData" ref="searchData" :inline="true" :label-width="labelWidth">
<el-form-item label="随访计划名称：" prop="name">
<el-input v-model="searchData.name" size="small" placeholder="请输入随访计划名称" clearable></el-input>
<el-form-item label="随访计划名称：" prop="planName">
<el-input v-model="searchData.planName" size="small" placeholder="请输入随访计划名称" clearable></el-input>
</el-form-item>
<el-form-item label="姓名：" prop="nickName">
<el-input v-model="searchData.nickName" size="small" placeholder="请输入姓名" clearable></el-input>
<el-form-item label="姓名：" prop="nickname">
<el-input v-model="searchData.nickname" size="small" placeholder="请输入姓名" clearable></el-input>
</el-form-item>
<el-form-item label="手机号：" prop="mobilePhone">
<el-input v-model="searchData.mobilePhone" size="small" placeholder="请输入手机号" clearable></el-input>
</el-form-item>
<el-form-item label="随访时间范围：" prop="planTimes" clearable>
<el-date-picker
v-model="searchData.timeRange"
v-model="searchData.planTimes"
type="daterange"
size="small"
range-separator="至"
......@@ -50,15 +50,15 @@
</div>
<div class="reservation-table table-content">
<el-radio-group v-model="status" size="small">
<el-radio-button label="0">全部({{reservationList.total}})</el-radio-button>
<el-radio-button label="1">未发送({{reservationList.notCount}})</el-radio-button>
<el-radio-button label="2">待确认({{reservationList.handCount}})</el-radio-button>
<el-radio-button label="3">已接受({{reservationList.yesCount}})</el-radio-button>
<el-radio-button label="4">已拒绝({{reservationList.refuseCount }})</el-radio-button>
<el-radio-button label="0">全部({{reservationList.count}})</el-radio-button>
<el-radio-button label="1">未发送({{reservationList.unSendCount}})</el-radio-button>
<el-radio-button label="2">待确认({{reservationList.waitAcceptCount}})</el-radio-button>
<el-radio-button label="3">已接受({{reservationList.acceptedCount}})</el-radio-button>
<el-radio-button label="4">已拒绝({{reservationList.refusedCount }})</el-radio-button>
</el-radio-group>
<el-button class="button-green" type="primary" size="small" @click="sendReservation">发送预约</el-button>
<el-table
:data="reservationList.fuPlanInfoList"
:data="reservationList.enteringDtos"
center
style="width: 100%;margin-top: 20px;"
@selection-change="handleSelectionChange">
......@@ -67,11 +67,11 @@
align="center">
</el-table-column>
<el-table-column
prop="nickName"
prop="nickname"
label="姓名"
align="center">
<template slot-scope="scope">
<el-button type="text" @click="goPatientDetail(scope.row)" >{{scope.row.nickName}}</el-button>
<el-button type="text" @click="goPatientDetail(scope.row)" >{{scope.row.nickname}}</el-button>
</template>
</el-table-column>
<el-table-column
......@@ -195,11 +195,14 @@
this.searchData.planTimes = [this.$route.query.appointTime,this.$route.query.appointTime];
this.getReservationList({
planName: this.$route.query.planName,
planFromTime: this.$route.query.appointTime,
planToTime: this.$route.query.appointTime,
beginTime: this.$route.query.appointTime,
endTime: this.$route.query.appointTime,
status: this.status
})
} else {
this.getReservationList();
this.getReservationList({
status: this.status
});
}
},
......@@ -253,8 +256,8 @@
mobilePhone,
timeStatus,
nickName,
planFromTime: this.searchData.planTimes[0],
planToTime: this.searchData.planTimes[1],
beginTime: this.searchData.planTimes[0],
endTime: this.searchData.planTimes[1],
status: this.status
}
} else {
......
src/views/home.vue
浏览文件 @ 1cd22ccb
......@@ -6,7 +6,7 @@
<el-col class="visitor screenSet" :span="24">
<div class="visitor-title">
<div class="title">今日随访：
<span style="color:#449284;margin-right: 10px">10人</span>
<span style="color:#449284;margin-right: 10px">{{todayPlansList.length}}人</span>
<span class="type-button" :style="{background:(planBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayPlansList(0)">未完成</span>
<span class="type-button" :style="{background:(!planBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayPlansList(1)">已过期</span>
</div>
......@@ -16,10 +16,10 @@
<el-table
:data="todayPlansList"
style="width: 100%">
<el-table-column prop="patientName" label="姓名"></el-table-column>
<el-table-column prop="appointTime" label="预约时间"></el-table-column>
<el-table-column prop="style" label="随访方式"></el-table-column>
<el-table-column prop="content" label="操作">
<el-table-column prop="patientName" label="姓名" align="center"></el-table-column>
<el-table-column prop="appointTime" label="预约时间" align="center"></el-table-column>
<el-table-column prop="fuTypeStr" label="随访方式" align="center"></el-table-column>
<el-table-column prop="content" label="操作" align="center">
<template slot-scope="scope">
<span class="text-btn">随访录入</span> | <span class="text-btn" @click="changeFollowStatus(scope.row)">变更随访状态</span>
</template>
......@@ -39,11 +39,11 @@
<el-table
:data="todayAppointsList"
style="width: 100%">
<el-table-column prop="planName" label="随访计划名称"></el-table-column>
<el-table-column prop="appointTime" label="随访计划时间"></el-table-column>
<el-table-column prop="appointedCount" label="已经预约"></el-table-column>
<el-table-column prop="notAppointedCount" label="未预约"></el-table-column>
<el-table-column prop="content" label="操作">
<el-table-column prop="planName" label="随访计划名称" align="center"></el-table-column>
<el-table-column prop="appointTime" label="随访计划时间" align="center"></el-table-column>
<el-table-column prop="hasAppointed" label="已经预约" align="center"></el-table-column>
<el-table-column prop="notAppointedCount" label="未预约" align="center"></el-table-column>
<el-table-column prop="content" label="操作" align="center">
<template slot-scope="scope">
<span class="text-btn" @click="goToReservation(scope.row.planName, scope.row.appointTime)">去预约</span>
</template>
......@@ -179,6 +179,8 @@ export default {
},
changeFollowStatus(row) {
this.statusForm = {
fuPlanPatientTimesId: row.fuPlanPatientTimesId,
patientId: row.patientId,
nickname: row.patientName,
status: row.status,
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或