Skip to content

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

Merge branch 'feature/jq' into 'develop' 

Feature/jq

See merge request !160
上级 2f250f54 9c7e67c2
隐藏空白字符变更
内嵌 并排
正在显示 包含 227 行增加 和 119 行删除
package.json
浏览文件 @ 0d29398d
......@@ -19,6 +19,10 @@
"tinypng": "pica-cli-service tinypng"
},
"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",
"clipboard": "^2.0.6",
"core-js": "^3.6.5",
......
src/components/list/table-serviceSchedule.vue
浏览文件 @ 0d29398d
......@@ -127,7 +127,7 @@
</div>
<div
class="download-btn"
@click="addSchedule(scope.row, 2)"
@click="addSchedule(scope.row, 3)"
>
查看
</div>
......
src/utils/GeneralData/diagnosis-list-new.js
浏览文件 @ 0d29398d
......@@ -35,6 +35,11 @@ export const DIAGNOS_LIST_NEW = [
label: '状态备注',
showtooltip: true,
},
{
prop: 'matchingWay',
label: '匹配方式',
showtooltip: true,
},
{
prop: 'toFollowReason',
label: '稍后跟进状态',
......
src/utils/constants.js
浏览文件 @ 0d29398d
......@@ -81,7 +81,17 @@ export const ORDER_PRICE = [
value: 9999,
},
];
// 匹配方式
export const MATCHING_LIST = [
{
label: '自动匹配',
value: 1,
},
{
label: '人工匹配',
value: 2,
},
];
// 订单状态
export const STATUS_LIST = [
{
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ 0d29398d
......@@ -208,6 +208,26 @@
/>
</el-form-item>
</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 class="form-li">
<div>
......@@ -475,6 +495,7 @@
RUN_TAB_LIST,
MATCH_TAB_LIST,
ORDER_PRICE,
MATCHING_LIST,
} from '@/utils/constants';
import {
getCountQuery,
......@@ -549,6 +570,7 @@
status: '',
price: '',
refundRemark: '',
matchingWay: null,
},
noteList: [],
alltabslist: [],
......@@ -556,6 +578,7 @@
fllowList: IS_FLLOW,
sourceList: SOURCE_LIST,
priceList: ORDER_PRICE,
matchingWayList: MATCHING_LIST,
tabpaneList: [],
rematchingOptions: [], // 备注信息
Raw_tabpaneList: [],
......@@ -627,7 +650,9 @@
methods: {
changeStartTime(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');
},
......@@ -925,6 +950,7 @@
triageDepartmentId: '',
price: '',
refundRemark: '',
matchingWay: null,
diagnoseType: '', // 预约问诊类型：1、音频 2、视频 3、图文
createdTimeBegin: '',
createdTimeEnd: '',
......
src/views/IM/diagnosis-admin/serviceSchedule.vue
浏览文件 @ 0d29398d
......@@ -12,82 +12,85 @@
</div>
<div class="serviceSchedule-container">
<div class="serviceSchedule-containerInfo">
<el-cascader
v-model="innerform"
class="serviceSchedule-cascader"
filterable
clearable
:options="interfaceOptions"
:props="props"
placeholder="选择科室"
:show-all-levels="false"
@expand-change="handleItemChange"
@change="selectApi($event, innerform)"
/>
<el-select
v-model="searchParam.createType"
class="select-first"
placeholder="选择优先级"
clearable
>
<el-option
v-for="(item, index) of createList"
:key="index"
:label="item"
:value="item"
<div class="serviceSchedule-containerInfo-left">
<el-cascader
v-model="innerform"
class="serviceSchedule-cascader"
filterable
clearable
:options="interfaceOptions"
:props="props"
placeholder="选择科室"
:show-all-levels="false"
@expand-change="handleItemChange"
@change="selectApi($event, innerform)"
/>
</el-select>
<el-select
v-model="searchParam.serviceOpen"
class="select-first"
placeholder="选择开通状态"
clearable
>
<el-option
v-for="item of serviceOpenList"
:key="item.id"
:label="item.value"
:value="item.id"
<el-select
v-model="searchParam.createType"
class="select-first"
placeholder="选择优先级"
clearable
>
<el-option
v-for="(item, index) of createList"
:key="index"
:label="item"
:value="item"
/>
</el-select>
<el-select
v-model="searchParam.serviceOpen"
class="select-first"
placeholder="选择开通状态"
clearable
>
<el-option
v-for="item of serviceOpenList"
:key="item.id"
:label="item.value"
:value="item.id"
/>
</el-select>
<el-select
v-model="searchParam.ScheduleStatus"
class="serviceSchedule-status"
placeholder="选择排班状态"
clearable="true"
>
<el-option
v-for="item of ScheduleStatusList"
:key="item.id"
:label="item.value"
:value="item.id"
/>
</el-select>
<el-date-picker
v-model="searchParam.createRangeTime"
class="serviceSchedule-time"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="→"
size="large"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
/>
</el-select>
<el-select
v-model="searchParam.ScheduleStatus"
class="serviceSchedule-status"
placeholder="选择排班状态"
clearable="true"
>
<el-option
v-for="item of ScheduleStatusList"
:key="item.id"
:label="item.value"
:value="item.id"
<el-input
v-model="searchParam.idNamePhone"
clearable
class="serviceSchedule-idNamePhone"
placeholder="输入问诊单号/医生姓名/手机号"
style="width: 280px"
/>
</el-select>
<el-date-picker
v-model="searchParam.createRangeTime"
class="serviceSchedule-time"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="→"
size="large"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
/>
<el-input
v-model="searchParam.idNamePhone"
clearable
class="serviceSchedule-idNamePhone"
placeholder="输入问诊单号/医生姓名/手机号"
style="width: 280px"
/>
<el-button
type="primary"
class="submit-btn"
@click="search"
>
查询
</el-button>
<el-button
type="primary"
class="submit-btn"
@click="search"
>
查询
</el-button>
</div>
<div class="synchro-btn-icon">
<el-button
class="synchro-btn"
......@@ -165,7 +168,6 @@
workInStep,
getLevel,
} from '@/api/serviceSchedule';
import { SERVICESCHEDUle_TABLE } from '@/utils/GeneralData/serviceSchedule-table';
import TableServiceSchedule from '@/components/list/table-serviceSchedule';
import NewScheduling from '../diagnosis-admin/modal/newScheduling.vue';
export default {
......@@ -224,7 +226,6 @@
},
},
ScheduleListShow: true,
showTableData: SERVICESCHEDUle_TABLE,
tableData: [],
loading: false,
newCreateList: [],
......@@ -279,14 +280,12 @@
const params = {
departmentId: this.searchParam.departmentId || null,
workStatus: String(this.searchParam.ScheduleStatus) || null,
startTime:
this.searchParam.createRangeTime.length > 0
? this.searchParam.createRangeTime[0]
: null,
endTime:
this.searchParam.createRangeTime.length > 0
? this.searchParam.createRangeTime[1]
: null,
startTime: this.searchParam.createRangeTime
? this.searchParam.createRangeTime[0]
: null,
endTime: this.searchParam.createRangeTime
? this.searchParam.createRangeTime[1]
: null,
condition: this.searchParam.idNamePhone || null,
level: this.searchParam.createType || null,
sort: this.searchParam.sort || null,
......@@ -326,7 +325,7 @@
switchOpen: val.switchStatus ? '1' : '2',
}).then((res) => {
if (res.code === '000000') {
this.search();
// this.search();
}
});
},
......@@ -393,48 +392,58 @@
width: 100%;
padding: 0 14px;
.serviceSchedule-containerInfo {
background: #ffffff;
position: relative;
min-width: 1200px;
height: 73px;
border-radius: 8px;
display: flex;
align-items: center;
padding: 21px 18px 20px 18px;
.serviceSchedule-cascader {
margin-right: 15px;
}
.select-first {
margin-right: 15px;
}
.serviceSchedule-status {
margin-right: 15px;
}
.serviceSchedule-time {
width: 270px;
height: 32px;
background: #ffffff;
border-radius: 16px;
border: 1px solid rgba(0, 0, 0, 0.15);
margin-right: 15px;
}
.serviceSchedule-idNamePhone {
width: 320px;
margin-right: 15px;
}
.submit-btn {
width: 70px;
height: 32px;
background: #0d9078;
border-radius: 16px;
justify-content: space-between;
padding: 21px 18px 10px 18px;
.serviceSchedule-containerInfo-left {
display: flex;
align-items: center;
flex-wrap: wrap;
.serviceSchedule-cascader {
margin-right: 15px;
margin-bottom: 10px;
}
.select-first {
margin-right: 15px;
margin-bottom: 10px;
}
.serviceSchedule-status {
margin-right: 15px;
margin-bottom: 10px;
}
.serviceSchedule-time {
max-width: 270px;
height: 32px;
background: #ffffff;
border-radius: 16px;
border: 1px solid rgba(0, 0, 0, 0.15);
margin-right: 15px;
margin-bottom: 10px;
}
.serviceSchedule-idNamePhone {
width: 320px;
margin-right: 15px;
margin-bottom: 10px;
}
.submit-btn {
height: 32px;
background: #0d9078;
border-radius: 16px;
display: flex;
align-items: center;
margin-bottom: 10px;
}
}
.synchro-btn-icon {
display: flex;
align-items: center;
justify-content: center;
position: absolute;
right: 20px;
margin-bottom: 10px;
.synchro-btn {
width: 110px;
height: 32px;
......@@ -457,7 +466,7 @@
}
}
.serviceSchedule-table {
min-width: 1200px;
// min-width: 1200px;
padding-top: 15px;
}
}
......
yarn.lock
浏览文件 @ 0d29398d
......@@ -1039,6 +1039,55 @@
dependencies:
"@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":
version "1.1.2"
resolved "http://192.168.110.93:4873/@gar%2fpromisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
......@@ -10439,6 +10488,11 @@ pre-commit@^1.2.2:
spawn-sync "^1.0.15"
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:
version "1.1.2"
resolved "http://192.168.110.93:4873/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或