Skip to content

P
pica-admin-consultation
提交 9c7e67c2 编写于 作者: qian.jie's avatar qian.jie
浏览文件
操作

代码合并

上级 a06f9311 2f250f54
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 561 行增加 和 165 行删除
.vscode/settings.json 已删除 100644 → 0
浏览文件 @ a06f9311
{
// 是否允许自定义的snippet片段提示
"editor.snippetSuggestions": "top",
// vscode默认启用了根据文件类型自动设置tabsize的选项
"editor.detectIndentation": false,
// 重新设定tabsize
"editor.tabSize": 2,
// #每次保存的时候自动格式化
"editor.formatOnSave": false,
// #每次保存的时候将代码按eslint格式进行修复
"eslint.autoFixOnSave": true,
"editor.fontWeight": "300",
"editor.formatOnType": false,
"workbench.iconTheme": "material-icon-theme",
"git.confirmSync": false,
"team.showWelcomeMessage": false,
"window.zoomLevel": 0,
// "editor.renderWhitespace": "boundary",
"editor.cursorBlinking": "smooth",
"editor.minimap.enabled": true,
// "editor.minimap.renderCharacters": false,
"window.title": "${dirty}${activeEditorMedium}${separator}${rootName}",
"editor.codeLens": true,
//eslint 代码自动检查相关配置
"eslint.enable": true,
"eslint.run": "onType",
"eslint.options": {
"extensions": [
".js",
".vue"
]
},
// 添加 vue 支持
"eslint.validate": [
"javascriptreact",
"vue",
"javascript",
{
"language": "vue",
"autoFix": true
},
"html",
{
"language": "html",
"autoFix": true
}
],
// #让prettier使用eslint的代码格式进行校验
"prettier.eslintIntegration": true,
// #去掉代码结尾的分号
"prettier.semi": false,
// #使用带引号替代双引号
"prettier.singleQuote": true,
// #让函数(名)和后面的括号之间加个空格
"javascript.format.insertSpaceBeforeFunctionParenthesis": true,
// #这个按用户自身习惯选择
"vetur.format.defaultFormatter.html": "js-beautify-html",
// #让vue中的js按编辑器自带的ts格式进行格式化
"vetur.format.defaultFormatter.js": "vscode-typescript",
"explorer.confirmDelete": false,
"vetur.format.defaultFormatterOptions": {
"js-beautify-html": {
"wrap_attributes": "force-aligned"
// #vue组件中html代码格式化样式
}
},
"files.associations": {
"*.cjson": "jsonc",
"*.wxss": "css",
"*.wxs": "javascript"
},
"emmet.includeLanguages": {
"wxml": "html"
},
"minapp-vscode.disableAutoConfig": true,
"window.menuBarVisibility": "visible",
"git.enableSmartCommit": true,
"git.autofetch": true,
"liveServer.settings.donotShowInfoMsg": true,
"[html]": {
"editor.defaultFormatter": "vscode.html-language-features"
},
"javascript.updateImportsOnFileMove.enabled": "always",
"workbench.colorTheme": "SynthWave '84",
"editor.fontSize": 16,
"search.followSymlinks": false,
"workbench.sideBar.location": "left",
// 是否开启保存自动格式化
"zenMode.restore": true,
"breadcrumbs.enabled": true,
"gitlens.advanced.messages": {
"suppressLineUncommittedWarning": true
},
"javascript.format.placeOpenBraceOnNewLineForControlBlocks": true,
"editor.formatOnPaste": false,
"editor.cursorStyle": "line-thin",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
}
package.json
浏览文件 @ 9c7e67c2
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
"tinypng": "pica-cli-service tinypng" "tinypng": "pica-cli-service tinypng"
}, },
"dependencies": { "dependencies": {
"@fullcalendar/daygrid": "^5.10.0",
"@fullcalendar/interaction": "^5.10.0",
"@fullcalendar/timegrid": "^5.10.0",
"@fullcalendar/vue": "^5.10.0",
"axios": "^0.19.2", "axios": "^0.19.2",
"clipboard": "^2.0.6", "clipboard": "^2.0.6",
"core-js": "^3.6.5", "core-js": "^3.6.5",
......
src/components/list/table-serviceSchedule.vue
浏览文件 @ 9c7e67c2
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</div> </div>
<div <div
class="download-btn" class="download-btn"
@click="addSchedule(scope.row, 2)" @click="addSchedule(scope.row, 3)"
> >
查看 查看
</div> </div>
......
src/utils/GeneralData/diagnosis-list-new.js
浏览文件 @ 9c7e67c2
...@@ -35,6 +35,11 @@ export const DIAGNOS_LIST_NEW = [ ...@@ -35,6 +35,11 @@ export const DIAGNOS_LIST_NEW = [
label: '状态备注', label: '状态备注',
showtooltip: true, showtooltip: true,
}, },
{
prop: 'matchingWay',
label: '匹配方式',
showtooltip: true,
},
{ {
prop: 'toFollowReason', prop: 'toFollowReason',
label: '稍后跟进状态', label: '稍后跟进状态',
......
src/utils/constants.js
浏览文件 @ 9c7e67c2
...@@ -81,7 +81,17 @@ export const ORDER_PRICE = [ ...@@ -81,7 +81,17 @@ export const ORDER_PRICE = [
value: 9999, value: 9999,
}, },
]; ];
// 匹配方式
export const MATCHING_LIST = [
{
label: '自动匹配',
value: 1,
},
{
label: '人工匹配',
value: 2,
},
];
// 订单状态 // 订单状态
export const STATUS_LIST = [ export const STATUS_LIST = [
{ {
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ 9c7e67c2
...@@ -208,6 +208,26 @@ ...@@ -208,6 +208,26 @@
/> />
</el-form-item> </el-form-item>
</div> </div>
<div>
<el-form-item
label="匹配方式"
class="t-b"
>
<el-select
v-model="searchParam.matchingWay"
placeholder="请选择匹配方式"
clearable
style="width: 220px"
>
<el-option
v-for="item of matchingWayList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</div>
</div> </div>
<div class="form-li"> <div class="form-li">
<div> <div>
...@@ -475,6 +495,7 @@ ...@@ -475,6 +495,7 @@
RUN_TAB_LIST, RUN_TAB_LIST,
MATCH_TAB_LIST, MATCH_TAB_LIST,
ORDER_PRICE, ORDER_PRICE,
MATCHING_LIST,
} from '@/utils/constants'; } from '@/utils/constants';
import { import {
getCountQuery, getCountQuery,
...@@ -549,6 +570,7 @@ ...@@ -549,6 +570,7 @@
status: '', status: '',
price: '', price: '',
refundRemark: '', refundRemark: '',
matchingWay: null,
}, },
noteList: [], noteList: [],
alltabslist: [], alltabslist: [],
...@@ -556,6 +578,7 @@ ...@@ -556,6 +578,7 @@
fllowList: IS_FLLOW, fllowList: IS_FLLOW,
sourceList: SOURCE_LIST, sourceList: SOURCE_LIST,
priceList: ORDER_PRICE, priceList: ORDER_PRICE,
matchingWayList: MATCHING_LIST,
tabpaneList: [], tabpaneList: [],
rematchingOptions: [], // 备注信息 rematchingOptions: [], // 备注信息
Raw_tabpaneList: [], Raw_tabpaneList: [],
...@@ -627,7 +650,9 @@ ...@@ -627,7 +650,9 @@
methods: { methods: {
changeStartTime(time) { changeStartTime(time) {
this.rangeTimeData = time this.rangeTimeData = time
? time.time ? new Date(time.time).format('yyyy-MM-dd hh:mm:ss') : '' ? time.time
? new Date(time.time).format('yyyy-MM-dd hh:mm:ss')
: ''
: ''; : '';
console.log(this.rangeTimeData, 'this.rangeTimeData'); console.log(this.rangeTimeData, 'this.rangeTimeData');
}, },
...@@ -925,6 +950,7 @@ ...@@ -925,6 +950,7 @@
triageDepartmentId: '', triageDepartmentId: '',
price: '', price: '',
refundRemark: '', refundRemark: '',
matchingWay: null,
diagnoseType: '', // 预约问诊类型：1、音频 2、视频 3、图文 diagnoseType: '', // 预约问诊类型：1、音频 2、视频 3、图文
createdTimeBegin: '', createdTimeBegin: '',
createdTimeEnd: '', createdTimeEnd: '',
......
src/views/IM/diagnosis-admin/modal/index.scss 0 → 100644
浏览文件 @ 9c7e67c2
.agment-box {
height: 100%;
background: #fff;
overflow: hidden;
padding: 20px;
border-radius: 6px;
flex: 3.8;
}
.agment-box-left {
flex: 1;
height: 100%;
padding: 20px;
margin-left: 12px;
background: #fff;
border-radius: 6px;
}
.agment-left-con {
margin-top: 70px;
background: #f0f2f5;
height: auto;
padding: 20px;
overflow: hidden;
border-radius: 8px;
}
.agment-head {
border-radius: 5px;
display: flex;
justify-content: flex-start;
align-items: flex-end;
}
.agment-head-name {
font-size: 20px;
color: #02120f;
font-weight: 600;
}
.agment-head-phone {
font-size: 18px;
margin-left: 16px;
}
.agment-hospital {
color: #89888b;
font-size: 16px;
margin-top: 14px;
line-height: 24px;
}
.agment-hospital-ks {
margin-top: 8px;
}
.agment-head-title {
font-size: 14px;
color: #02120f;
margin-top: 19px;
}
.agment-head-priority {
padding-top: 20px;
display: flex;
justify-content: space-between;
align-items: center;
.item {
width: 42px;
height: 32px;
border: 1px solid #d9d9d9;
border-radius: 8px;
text-align: center;
line-height: 32px;
cursor: pointer;
}
.active {
color: #fff;
background: #0d9078;
border: none;
}
}
.agment-left-button {
margin-top: 34px;
display: flex;
justify-content: space-around;
}
/deep/.fc-timegrid-event {
border-radius: 1px !important;
}
/deep/thead .fc-scroller-harness {
background: #fcfbff;
}
/deep/.fc-col-header-cell-cushion {
color: #333;
height: 45px;
line-height: 45px;
}
/deep/.fc .fc-highlight {
background: transparent;
}
/deep/.fc-header-toolbar {
position: absolute;
right: 0;
top: 25px;
width: 20%;
display: flex;
}
/deep/.fc-toolbar-title {
font-size: 6px;
}
/deep/.fc-button-primary {
background: #fff;
color: #02120f;
border-color: #d9d9d9;
border-radius: 8px;
padding: 1.3px 5px;
}
/deep/.fc-button-primary:hover {
background: #fff;
color: #02120f;
}
src/views/IM/diagnosis-admin/serviceSchedule.vue
浏览文件 @ 9c7e67c2
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
查询 查询
</el-button> </el-button>
</div> </div>
<div class="synchro-btn-icon"> <div class="synchro-btn-icon">
<el-button <el-button
class="synchro-btn" class="synchro-btn"
...@@ -168,7 +168,6 @@ ...@@ -168,7 +168,6 @@
workInStep, workInStep,
getLevel, getLevel,
} from '@/api/serviceSchedule'; } from '@/api/serviceSchedule';
import { SERVICESCHEDUle_TABLE } from '@/utils/GeneralData/serviceSchedule-table';
import TableServiceSchedule from '@/components/list/table-serviceSchedule'; import TableServiceSchedule from '@/components/list/table-serviceSchedule';
import NewScheduling from '../diagnosis-admin/modal/newScheduling.vue'; import NewScheduling from '../diagnosis-admin/modal/newScheduling.vue';
export default { export default {
...@@ -227,7 +226,6 @@ ...@@ -227,7 +226,6 @@
}, },
}, },
ScheduleListShow: true, ScheduleListShow: true,
showTableData: SERVICESCHEDUle_TABLE,
tableData: [], tableData: [],
loading: false, loading: false,
newCreateList: [], newCreateList: [],
...@@ -282,14 +280,12 @@ ...@@ -282,14 +280,12 @@
const params = { const params = {
departmentId: this.searchParam.departmentId || null, departmentId: this.searchParam.departmentId || null,
workStatus: String(this.searchParam.ScheduleStatus) || null, workStatus: String(this.searchParam.ScheduleStatus) || null,
startTime: startTime: this.searchParam.createRangeTime
this.searchParam.createRangeTime.length > 0 ? this.searchParam.createRangeTime[0]
? this.searchParam.createRangeTime[0] : null,
: null, endTime: this.searchParam.createRangeTime
endTime: ? this.searchParam.createRangeTime[1]
this.searchParam.createRangeTime.length > 0 : null,
? this.searchParam.createRangeTime[1]
: null,
condition: this.searchParam.idNamePhone || null, condition: this.searchParam.idNamePhone || null,
level: this.searchParam.createType || null, level: this.searchParam.createType || null,
sort: this.searchParam.sort || null, sort: this.searchParam.sort || null,
...@@ -329,7 +325,7 @@ ...@@ -329,7 +325,7 @@
switchOpen: val.switchStatus ? '1' : '2', switchOpen: val.switchStatus ? '1' : '2',
}).then((res) => { }).then((res) => {
if (res.code === '000000') { if (res.code === '000000') {
this.search(); // this.search();
} }
}); });
}, },
...@@ -396,56 +392,58 @@ ...@@ -396,56 +392,58 @@
width: 100%; width: 100%;
padding: 0 14px; padding: 0 14px;
.serviceSchedule-containerInfo { .serviceSchedule-containerInfo {
position: relative;
min-width: 1200px;
background: #ffffff; background: #ffffff;
// height: 73px; position: relative;
border-radius: 8px; border-radius: 8px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 21px 18px 20px 18px; padding: 21px 18px 10px 18px;
.serviceSchedule-containerInfo-left{ .serviceSchedule-containerInfo-left {
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
.serviceSchedule-cascader { .serviceSchedule-cascader {
margin-right: 15px; margin-right: 15px;
} margin-bottom: 10px;
.select-first { }
margin-right: 15px; .select-first {
} margin-right: 15px;
.serviceSchedule-status { margin-bottom: 10px;
margin-right: 15px; }
} .serviceSchedule-status {
.serviceSchedule-time { margin-right: 15px;
max-width: 270px; margin-bottom: 10px;
height: 32px; }
background: #ffffff; .serviceSchedule-time {
border-radius: 16px; max-width: 270px;
border: 1px solid rgba(0, 0, 0, 0.15); height: 32px;
margin-right: 15px; background: #ffffff;
} border-radius: 16px;
.serviceSchedule-idNamePhone { border: 1px solid rgba(0, 0, 0, 0.15);
width: 320px; margin-right: 15px;
margin-right: 15px; margin-bottom: 10px;
} }
.submit-btn { .serviceSchedule-idNamePhone {
// width: 70px; width: 320px;
height: 32px; margin-right: 15px;
background: #0d9078; margin-bottom: 10px;
border-radius: 16px; }
display: flex; .submit-btn {
align-items: center; height: 32px;
} background: #0d9078;
border-radius: 16px;
display: flex;
align-items: center;
margin-bottom: 10px;
}
} }
.synchro-btn-icon { .synchro-btn-icon {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
// position: absolute; margin-bottom: 10px;
// right: 20px;
.synchro-btn { .synchro-btn {
width: 110px; width: 110px;
height: 32px; height: 32px;
...@@ -468,7 +466,7 @@ ...@@ -468,7 +466,7 @@
} }
} }
.serviceSchedule-table { .serviceSchedule-table {
min-width: 1200px; // min-width: 1200px;
padding-top: 15px; padding-top: 15px;
} }
} }
...@@ -494,12 +492,11 @@ ...@@ -494,12 +492,11 @@
width: 100%; width: 100%;
padding: 0 14px; padding: 0 14px;
.serviceSchedule-containerInfo { .serviceSchedule-containerInfo {
background: #ffffff;
border-radius: 8px; border-radius: 8px;
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 21px 18px 20px 18px; //padding: 21px 18px 20px 18px;
} }
} }
} }
......
yarn.lock
浏览文件 @ 9c7e67c2
...@@ -1039,6 +1039,55 @@ ...@@ -1039,6 +1039,55 @@
dependencies: dependencies:
"@fortawesome/fontawesome-common-types" "^0.2.36" "@fortawesome/fontawesome-common-types" "^0.2.36"
"@fullcalendar/common@~5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2fcommon/-/common-5.10.0.tgz#8b30f3e77691eb70befb25a0edf3d9abec3a853e"
integrity sha1-izDz53aR63C++yWg7fPZq+w6hT4=
dependencies:
tslib "^2.1.0"
"@fullcalendar/core@~5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2fcore/-/core-5.10.0.tgz#5e8f46618bf45ddfb16827e68fe11dbd655d529f"
integrity sha1-Xo9GYYv0Xd+xaCfmj+EdvWVdUp8=
dependencies:
"@fullcalendar/common" "~5.10.0"
preact "^10.0.5"
tslib "^2.1.0"
"@fullcalendar/daygrid@^5.10.0", "@fullcalendar/daygrid@~5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2fdaygrid/-/daygrid-5.10.0.tgz#1dffcb6884859f0048755a428ff911906150a1af"
integrity sha1-Hf/LaISFnwBIdVpCj/kRkGFQoa8=
dependencies:
"@fullcalendar/common" "~5.10.0"
tslib "^2.1.0"
"@fullcalendar/interaction@^5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2finteraction/-/interaction-5.10.0.tgz#047622f903f13a89fd146878137d66eecf1acc62"
integrity sha1-BHYi+QPxOon9FGh4E31m7s8azGI=
dependencies:
"@fullcalendar/common" "~5.10.0"
tslib "^2.1.0"
"@fullcalendar/timegrid@^5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2ftimegrid/-/timegrid-5.10.0.tgz#7177914bdc5a6c58ec4af851520b12eb8c480141"
integrity sha1-cXeRS9xabFjsSvhRUgsS64xIAUE=
dependencies:
"@fullcalendar/common" "~5.10.0"
"@fullcalendar/daygrid" "~5.10.0"
tslib "^2.1.0"
"@fullcalendar/vue@^5.10.0":
version "5.10.0"
resolved "http://192.168.110.93:4873/@fullcalendar%2fvue/-/vue-5.10.0.tgz#e0b8ddce92b06457f05410c0e18fa1b1745f22ab"
integrity sha1-4LjdzpKwZFfwVBDA4Y+hsXRfIqs=
dependencies:
"@fullcalendar/core" "~5.10.0"
tslib "^2.1.0"
"@gar/promisify@^1.0.1": "@gar/promisify@^1.0.1":
version "1.1.2" version "1.1.2"
resolved "http://192.168.110.93:4873/@gar%2fpromisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" resolved "http://192.168.110.93:4873/@gar%2fpromisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
...@@ -10439,6 +10488,11 @@ pre-commit@^1.2.2: ...@@ -10439,6 +10488,11 @@ pre-commit@^1.2.2:
spawn-sync "^1.0.15" spawn-sync "^1.0.15"
which "1.2.x" which "1.2.x"
preact@^10.0.5:
version "10.5.15"
resolved "http://192.168.110.93:4873/preact/-/preact-10.5.15.tgz#6df94d8afecf3f9e10a742fd8c362ddab464225f"
integrity sha1-bflNiv7PP54Qp0L9jDYt2rRkIl8=
prelude-ls@~1.1.2: prelude-ls@~1.1.2:
version "1.1.2" version "1.1.2"
resolved "http://192.168.110.93:4873/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" resolved "http://192.168.110.93:4873/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或