diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js
index 11d325f..33dc029 100644
--- a/Pages/yishi/index/index.js
+++ b/Pages/yishi/index/index.js
@@ -387,6 +387,9 @@ Page({
// const { current, source } = e.detail;
// console.log(current, source);
},
+ goChuFang(e){
+ app.go(e.currentTarget.dataset.url)
+ },
go(e){
let checkDialog = this.checkDialog(e);
// console.log("checkDialog: ", checkDialog);
diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml
index e0a751f..a3456b4 100644
--- a/Pages/yishi/index/index.wxml
+++ b/Pages/yishi/index/index.wxml
@@ -1,4 +1,4 @@
-
+
@@ -139,7 +139,7 @@
/>
公益问诊管理
-
+
+
+
+
+
+
+
联系客服
+
+
+
diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss
index b9673ab..23b96d5 100644
--- a/Pages/yishi/index/index.wxss
+++ b/Pages/yishi/index/index.wxss
@@ -1,11 +1,15 @@
page{
background-color: #FAFAFA;
+ overflow-y: scroll;
}
.container{
width: 100vw;
+ overflow-y: scroll;
+
}
+
.top_bk{
- position: fixed;
+ position: absolute;
top: -2230rpx;
left: 50%;
transform: translateX(-50%);
@@ -179,7 +183,7 @@ page{
}
.fun_box{
width: 90vw;
- margin: 30rpx auto 0 auto;
+ margin: 30rpx auto 20rpx auto;
padding: 30rpx 0;
box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.1);
display: flex;
diff --git a/app.json b/app.json
index c61de92..61c9a0f 100644
--- a/app.json
+++ b/app.json
@@ -21,6 +21,7 @@
"pages/yishi/identity/index",
"pages/yishi/onlinesetup/index",
"pages/yishi/chufangsetup/index",
+ "pages/yishi/transferchufangsetup/index",
"pages/yishi/onlinechufang/index",
"pages/yishi/zhiye_identity/index",
"pages/yishi/signcanvas/index",
diff --git a/miniprogram-doctor.zip b/miniprogram-doctor.zip
new file mode 100644
index 0000000..7ed12b5
Binary files /dev/null and b/miniprogram-doctor.zip differ
diff --git a/user/pages/yishi/transferchufangsetup/index.js b/user/pages/yishi/transferchufangsetup/index.js
new file mode 100644
index 0000000..978d000
--- /dev/null
+++ b/user/pages/yishi/transferchufangsetup/index.js
@@ -0,0 +1,119 @@
+import { API } from '../../../../utils/network/api'
+const api = new API()
+const app = getApp()
+Page({
+ data: {
+ navbarData: {
+ showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示
+ title: '抄方处方管理', //导航栏 中间的标题
+ },
+ height: app.globalData.height,
+ stickyProps: {
+ offsetTop: app.globalData.height*2 + 20,
+ zIndex: 99
+ },
+ prescription_status: 0,
+ chufang_list_0: [],
+ chufang_list_1: [],
+ chufang_list_2: [],
+ current_page: 0,
+ total: 0,
+ per_page: 0,
+ last_page: 0,
+
+ },
+ onLoad(options){
+ console.log(options.status)
+ if(options.status){
+ this.setData({
+ pharmacist_audit_status:options.status,
+ prescription_status:options.status
+ })
+ }
+ },
+ onShow(){
+
+ this.getList();
+ },
+ onTabsChange(e) {
+ // console.log(e);
+ let list_name = "chufang_list_" + e.detail.value;
+ //console.log(list_name)
+ this.setData({
+ prescription_status: e.detail.value,
+ current_page: 0,
+ last_page: 0,
+ [list_name]: []
+ })
+ this.getList()
+ },
+
+ onTabsClick(event) {
+ console.log(`Click tab, tab-panel value is ${event.detail.value}.`);
+ },
+
+ onStickyScroll(event) {
+ // console.log(event.detail);
+ },
+ onPullDownRefresh(){
+ console.log('===下拉动作===');
+ this.setData({
+ current_page: 0,
+ })
+ this.getList();
+ },
+ onReachBottom() {
+ console.log('===触底了！！===');
+ if(this.data.current_page < this.data.last_page){//最后一页时停止分页
+ this.getList()
+ }
+ },
+ getList(){
+ //获取处方列表
+ let params = {};
+ params.pharmacist_audit_status = this.data.prescription_status;//处方审核状态（0:审核中 2:审核驳回）
+ params.page = this.data.current_page + 1;
+ api.getDoctorPrescriptionTransfer(params).then(response => {
+ //console.log(response);
+ if(response.data.total > 0){
+ let list_name = "chufang_list_" + this.data.prescription_status;
+ //console.log(list_name);
+ let apprise_list = this.data[list_name];
+ this.setData({
+ [list_name]: apprise_list.concat(response.data.data),
+ current_page: response.data.current_page,
+ total: response.data.total,
+ per_page: response.data.per_page,
+ last_page: response.data.last_page,
+ })
+ }
+ }).catch(errors => {console.error(errors);})
+ },
+ go(e){
+ let url = e.currentTarget.dataset.url;
+ //console.log(url);
+ app.go(url);
+ },
+ handlegetLastInquiry(patient_id,doctor_id,order_inquiry_id){
+ api.getLastInquiry({
+ patient_id:patient_id,
+ doctor_id:doctor_id
+ }).then(data=>{
+ let result=data.data;
+ let url='';
+ if(result){
+ url = "/TUIChatService/pages/index?order_inquiry_id="+result+"&from=prescription";
+ }else{
+ url = "/TUIChatService/pages/index?order_inquiry_id="+order_inquiry_id+"&from=prescription";
+
+ }
+
+ app.go(url);
+ })
+ },
+ gochat(e){
+ let {order_inquiry_id,patient_id,doctor_id} = e.currentTarget.dataset;
+ this.handlegetLastInquiry(patient_id,doctor_id,order_inquiry_id);
+
+ }
+})
\ No newline at end of file
diff --git a/user/pages/yishi/transferchufangsetup/index.json b/user/pages/yishi/transferchufangsetup/index.json
new file mode 100644
index 0000000..814a742
--- /dev/null
+++ b/user/pages/yishi/transferchufangsetup/index.json
@@ -0,0 +1,9 @@
+{
+ "component": true,
+ "usingComponents": {
+ "te-nav-bar": "../../../commpents/te_navbar/index",
+ "t-tabs": "tdesign-miniprogram/tabs/tabs",
+ "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
+ "van-empty": "@vant/weapp/empty/index"
+ }
+}
\ No newline at end of file
diff --git a/user/pages/yishi/transferchufangsetup/index.wxml b/user/pages/yishi/transferchufangsetup/index.wxml
new file mode 100644
index 0000000..cbeb92a
--- /dev/null
+++ b/user/pages/yishi/transferchufangsetup/index.wxml
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.patient_name}}
+ {{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁
+
+
+
+
+ {{item.pharmacist_audit_status==0?'审核中':item.pharmacist_audit_status==1?'审核成功':'审核驳回'}}
+
+
+
+
+
+
+ 开方时间：
+ {{item.created_at}}
+
+
+ 病情描述：
+ {{item.disease_desc}}
+
+
+ 确诊日期：
+ {{item.diagnosis_date}}
+
+
+ 病情诊断：
+
+ {{icd.icd_name}};
+
+
+
+
+
+ 问诊记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.patient_name}}
+ {{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁
+
+
+
+
+ {{item.pharmacist_audit_status==0?'审核中':item.pharmacist_audit_status==1?'审核成功':'审核驳回'}}
+
+
+
+
+
+
+ 开方时间：
+ {{item.created_at}}
+
+
+ 病情描述：
+ {{item.disease_desc}}
+
+
+ 确诊日期：
+ {{item.diagnosis_date}}
+
+
+ 病情诊断：
+
+ {{icd.icd_name}};
+
+
+
+
+
+ 问诊记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.patient_name}}
+ {{item.patient_sex==1?'男':'女'}} | {{item.patient_age}}岁
+
+
+
+
+ {{item.pharmacist_audit_status==0?'审核中':item.pharmacist_audit_status==1?'审核成功':'驳回'}}
+
+
+
+
+
+
+ 开方时间：
+ {{item.created_at}}
+
+
+ 病情描述：
+ {{item.disease_desc}}
+
+
+ 确诊日期：
+ {{item.diagnosis_date}}
+
+
+ 病情诊断：
+ {{item.icd_name}}
+
+
+ 驳回原因：
+ {{item.pharmacist_fail_reason}}
+
+
+
+
+ 问诊记录
+
+ 重开处方
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/user/pages/yishi/transferchufangsetup/index.wxss b/user/pages/yishi/transferchufangsetup/index.wxss
new file mode 100644
index 0000000..4038cff
--- /dev/null
+++ b/user/pages/yishi/transferchufangsetup/index.wxss
@@ -0,0 +1,111 @@
+page{
+ background-color: #F6F6F6;
+}
+.container{
+ width: 100vw;
+}
+.t-tabs__content{
+ background-color: #F6F6F6;
+}
+.t-tabs__item--active{
+ color: #49B9AD !important;
+}
+.t-tabs__track{
+ background-color: var(--td-tab-track-color, var(--td-primary-color, #49B9AD)) !important;
+}
+.item_list{
+ width: 90vw;
+ margin: 0 auto;
+}
+.item{
+ width: 100%;
+ border-radius: 20rpx;
+ background-color: #fff;
+ margin: 20rpx 0;
+}
+.namebox{
+ display: flex;
+}
+.item_top{
+ position: relative;
+ height: 100rpx;
+ display: flex;
+ justify-content:space-between;
+ align-items: center;
+ padding: 0 32rpx;
+}
+.item_top::after {
+ position: absolute;
+ box-sizing: border-box;
+ content: ' ';
+ pointer-events: none;
+ right: 32rpx;
+ left: 32rpx;
+ bottom: 0;
+ border-bottom: 1px dashed var(--td-cell-border-color, var(--td-gray-color-3, #999));
+ transform: scaleY(0.5);
+}
+.item_top_name{
+
+ color: #3CC7C0;
+ font-size: 34rpx;
+}
+.item_top_sex{
+ margin-left: 30rpx;
+ font-size: 34rpx;
+ color: #666;
+}
+.item_top_status_box{
+
+}
+.item_top_status{
+ padding: 10rpx;
+ color: #FA541C;
+ background-color: #FFF2E8;
+ text-align: center;
+ border-radius: 10rpx;
+ font-size: 24rpx;
+}
+.item_top_status_no{
+ color: #fff;
+ background-color: #999;
+}
+.item_content{
+ padding: 20rpx 32rpx 0rpx 32rpx;
+}
+.item_content_li{
+ display: flex;
+ padding-bottom: 20rpx;
+}
+.item_content_li_title{
+ font-size: 30rpx;
+}
+.item_content_li_txt{
+ margin-left: 10rpx;
+ flex: 1;
+ word-break: break-all;
+ color: #666666;
+ font-size: 28rpx;
+}
+.item_bottom{
+ height: 120rpx;
+}
+.item_bottom_btn{
+ position: relative;
+ top: 50%;
+ transform: translateY(-50%);
+ margin-right: 32rpx;
+ float: right;
+ text-align: center;
+ color: #fff;
+ padding: 15rpx 20rpx 15rpx 20rpx;
+ width: 150rpx;
+ background: linear-gradient(305deg, #FF931A 0%, #FCB75D 100%);
+ border-radius: 50rpx;
+ letter-spacing: 5rpx;
+ font-size: 28rpx;
+}
+.item_bottom_btn_repeat{
+ background: linear-gradient(129deg, #13DFD5 0%, #31C9C1 100%);
+
+}
\ No newline at end of file
diff --git a/utils/network/api.js b/utils/network/api.js
index 544fe77..b15bd53 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -373,6 +373,17 @@ class API extends HTTP {
}
})
}
+
+ //获取抄送处方列表
+ getDoctorPrescriptionTransfer(params) {
+ return this.request({
+ url: `${this.baseUrl}/doctor/prescription/transfer`,
+ method: 'GET',
+ data: {
+ ...params
+ }
+ })
+ }
//获取处方详情
getDoctorPrescriptionInfo(params) {
return this.request({