提交 170bb3bd 编写于 作者: 张磊's avatar 张磊

auto commit

上级 5136a5d5
......@@ -13,7 +13,6 @@ module.exports = {
// 全局变量
globals: {
'gdp': true,
'uni': true,
},
// add your custom rules here
//it is base on https://github.com/vuejs/eslint-config-vue
......
......@@ -12,7 +12,6 @@
<link rel="dns-prefetch" href="<%= process.env.VUE_APP_SERVICE_URL %>">
<link rel="icon" type="image/x-icon" href="<%= VUE_APP_OSS_URL %>static/img/logo.png">
<title>云鹊医</title>
</head>
<body>
<noscript>
......@@ -29,8 +28,6 @@
<script src="<%= VUE_APP_OSS_URL %>static/js/crypto.min-4.0.0.js"></script>
<script src="<%= VUE_APP_OSS_URL %>static/js/vconsole-3.3.4.js"></script>
<script src="<%= VUE_APP_OSS_URL %>static/js/lodash-4.17.15.js"></script>
<script type="text/javascript" src="https://unpkg.com/@dcloudio/uni-webview-js@0.0.3/index.js"></script>
<script>
!(function(c,b,d,a){c[a]||(c[a]={});c[a].config=
{
......
......@@ -26,7 +26,6 @@
</div>
<div class="time-list-right">
<div
v-show="currentItem.amTimeBegin !='' && currentItem.amTimeEnd !=''"
class="text"
:class="selectTimeBucket === 'amTimeBegin' ?'selected':''"
@click="selectTimeB('amTimeBegin')"
......@@ -34,7 +33,6 @@
{{ currentItem.amTimeContent }}
</div>
<div
v-if="currentItem.pmTimeBegin !='' && currentItem.pmTimeEnd!=''"
class="text"
:class="selectTimeBucket === 'pmTimeBegin' ?'selected':''"
@click="selectTimeB('pmTimeBegin')"
......@@ -84,7 +82,7 @@ export default {
};
},
watch: {
hospitalId: {
projectEquityNo: {
handler(nv) {
if (nv) {
this.getScheduling();
......@@ -157,7 +155,7 @@ export default {
if (!this.currentItem[item]) {
return;
}
this.selectTimeBucket = item === 'amTimeBegin' ? this.currentItem['amTimeBegin'] : this.currentItem['pmTimeBegin'];
this.selectTimeBucket = item === 'amTimeBegin' ? this.currentItem['amTimeContent'] : this.currentItem['pmTimeContent'];
this.selectItem();
}
}
......
......@@ -55,20 +55,24 @@ const routerConfig = [
component: () => import('@/views/pdf-preview/index.vue'),
},
];
// // 无问卷-0001 有问卷未填写-0101 已填写问卷未出结果-0102 已出结果无需领用-0401 已出结果未预约-0201 已预约未采样-0301 已预约已采样-0302
// const routerMap = {
// '0001': null,
// '0101': null,
// '0102': null,
// '0401': null,
// '0201': '/appoint',
// '0301': null,
// '0302': null,
// };
// 无问卷-0001 有问卷未填写-0101 已填写问卷未出结果-0102 已出结果无需领用-0401 已出结果未预约-0201 已预约未采样-0301 已预约已采样-0302
const routerMap = {
'0001': null,
'0101': null,
'0102': null,
'0401': null,
'0201': '/appoint',
'0301': null,
'0302': null,
};
router.beforeEach(async (to, from, next) => {
console.log(to, from, next);
if (to.name === 'home') {
console.log(to.name, routerMap);
} else {
next();
}
});
router.addRoutes(routerConfig);
......
......@@ -3,16 +3,12 @@ import store from 'storejs';
export default {
namespaced: true,
state: {
insuranceInfo: {},
orderInfo:{}
insuranceInfo: {}
},
mutations: {
// 存值
SET_INSURANCE_INFO(state, val = {}) {
state.insuranceInfo = val;
},
SET_ORDER_INFO(state, val = {}) {
state.orderInfo = val;
state.insuranceInfo += val;
}
},
actions: {
......@@ -21,22 +17,12 @@ export default {
commit('SET_INSURANCE_INFO', data);
store.set('insuranceInfo', data);
},
setOrderInfo({commit}, data) {
commit('SET_ORDER_INFO', data);
console.log('SET_ORDER_INFO', data);
store.set('orderInfo', data);
},
},
getters: {
// 获取 insuranceInfo 的值
insuranceInfo: state => {
const insuranceInfo = state.insuranceInfo.id ? state.insuranceInfo : store.get('insuranceInfo');
return insuranceInfo || {};
},
// 获取 订单详情 的值
orderInfo: state => {
const orderInfo = state.orderInfo.yunOrderNo ? state.orderInfo : store.get('orderInfo');
return orderInfo || {};
}
}
};
......@@ -145,12 +145,6 @@
</van-field>
</van-form>
</div>
<van-button
@click="submit"
>
提交1
</van-button>
<van-button
round
block
......@@ -255,10 +249,10 @@ export default {
longitude:''
},
locationAreaCode: [],
hospitalId: '',
hospitalId: '12746',
projectEquityNo: '',
yunOrderNo: '',
externalData: {},
externalData:{}
};
},
computed: {
......@@ -294,27 +288,10 @@ export default {
this.getDetectionName(yunOrderNo);
this.getOrderInfo(yunOrderNo);
this.initMap();
// document.addEventListener('UniAppJSBridgeReady', function() {
// console.log('UniAppJSBridgeReady', uni);
// });
// if (uni) {
// this.uni = uni;
// }
},
methods: {
choose() {},
submit() {
console.log(1122334);
uni.postMessage({
data: {
action: 'message'
}
});
uni.navigateTo({
url: '/pagesInsurance/binding-code/index'
});
console.log(1122334);
},
submit() { },
// 高德地图导航只有在线上环境才能使用
initMap() {
var that = this;
......@@ -380,13 +357,14 @@ export default {
// 目前是配置一个检测信息,可能会拓展,所以返回的是一个list
getDetectionName(yunOrderNo) {
getDetectionName(yunOrderNo).then(res => {
if (res.code === '000000' && res.data) {
const dectionData = res.data[0] || {};
console.log('getDetectionName', dectionData);
this.dectionData = dectionData;
this.dectionForm.detectName = dectionData.detectionName;
this.dectionForm.goodsId = dectionData.goodsId;
this.$store.dispatch('home/setInsuranceInfo', dectionData);
this.$store.dispatch('setInsuranceInfo', dectionData);
}
});
......@@ -398,7 +376,6 @@ export default {
this.dectionForm.beneficiaryName = res.data.beneficiaryName;
this.dectionForm.beneficiaryPhone = res.data.beneficiaryPhone;
this.dectionForm.beneficiaryIdNum = res.data.beneficiaryIdNum;
this.$store.dispatch('home/setOrderInfo', res.data);
});
},
......@@ -447,14 +424,7 @@ export default {
yunOrderNo:this.yunOrderNo,
};
appointment(data).then(res => {
if (res.code === '000000') {
this.$router.push({
path: '/appoint-details',
query: {
yunOrderNo:this.yunOrderNo
}
});
}
console.log('confirm', res);
});
},
......
......@@ -155,28 +155,14 @@ export default {
showSsheet:false,
yunOrderNo: '',
query:{},
// 状态 代码 说明
// 0101 未填写问卷
// 0102 已填写问卷
// 0201 待预约
// 0202 已预约
// 0203 已取消待重新预约
// 0301 待采样
// 0302 已采样
// 0303 待重新采样
// 0304 已出报告
// 0401 已结束
// 状态 0=待预约,1=已预约 ,2=已出报告 4=已取消 5=已过期
statusMap: {
'0101': '未填写问卷',
'0102': '已填写问卷',
'0201': '待预约',
'0202': '已预约',
'0203': '已取消待重新预约',
'0301': '待采样',
'0302': '已采样',
'0303': '待重新采样',
'0304': '已出报告',
'0401': '已结束',
0: '待预约',
1: '已预约',
2: '已出报告',
3: '已采样',
4: '已取消',
5: '已过期',
},
};
},
......@@ -199,16 +185,13 @@ export default {
getDetailByYunOrderNo(yunOrderNo) {
getDetailByYunOrderNo(yunOrderNo).then(res => {
console.log(res);
this.detailInfo = res.data;
});
},
checkDetail() {
},
reAppoint() {
this.$router.push({
});
},
selectItem(item) {
const geolocation = store.get('geolocation');
......@@ -235,6 +218,7 @@ export default {
break;
case 3:
// https://lbsyun.baidu.com/index.php?title=uri/api/web api地址
url = 'http://api.map.baidu.com/marker?location=' + latitude + ',' + longitude + '&title=' + hospitalName + '&output=html&src=webapp.baidu.openAPIdemo';
break;
default:
......@@ -244,16 +228,10 @@ export default {
}
console.log('geolocation', url);
window.open(url);
},
bindingCode() {
const {pprotocolType, detectionServiceRecordId} = this.detailInfo;
this.$router.push({
path: '/insuranceBindCode',
query: {
pprotocolType,
detectionRecordId:detectionServiceRecordId,
}
path:'/insuranceBindCode'
});
},
navigation() {
......
<template>
<div />
<div>111</div>
</template>
<script>
import { getJumpPageStatus} from '@/api/question';
export default {
data() {
return {
// 无问卷-0001 有问卷未填写-0101 已填写问卷未出结果-0102 已出结果无需领用-0401 已出结果未预约-0201 已预约未采样-0301 已预约已采样-0302
routerMap:{
'0001': '/appoint',
'0101': null,
'0102': '/insuranceQuestionBack',
'0401': '/insuranceQuestionResult',
'0201': '/appoint',
'0301': '/appoint-details',
'0302': '/insuranceBindCode',
}
};
},
methods: {
// 获取跳转状态
getJumpPageStatus() {
getJumpPageStatus(this.orderNo, this.projectEquityNo).then(res => {
if (res.code == '000000') {
this.yunOrderNo = res.data.yunOrderNo;
this.query.yunOrderNo = res.data.yunOrderNo;
this.status = res.data.status;
switch (res.data.status) {
case '0001':
this.turnToPage(this.routerMap[ this.status], this.query);
break;
case '0101':
// this.turnToPage(this.routerMap[ this.status], this.query);
// 跳转到问卷页面
window.location.href = res.data.url;
break;
case '0102':
// 跳转到结果页面;
this.turnToPage(this.routerMap[this.status], this.query);
break;
case '0401':
this.query.needDetect = 1;
this.turnToPage(this.routerMap[this.status], this.query);
break;
case '0201':
this.turnToPage(this.routerMap[this.status], this.query);
break;
case '0301':
this.turnToPage(this.routerMap[this.status], this.query);
break;
case '0302':
this.turnToPage(this.routerMap[this.status], this.query);
break;
default:
break;
}
}
});
},
turnToPage(path, query) {
this.$router.push({
path, query
});
}
}
};
</script>
......
......@@ -16,7 +16,7 @@
type="text"
class="code"
>
{{ detectionData.checkName || '' }}
{{ insuranceInfo.checkName || '' }}
</div>
<div class="code-input-item-r">
<div
......@@ -194,6 +194,7 @@
</template>
<script>
import { mapGetters } from 'vuex';
import { signDetection, getProtocolContent, getProtocolName, sampleCodeValidate, detectionRecordInfo, bindingSampleCode} from '@/api/detection.js';
export default {
data() {
......@@ -218,7 +219,6 @@ export default {
detectionRecordId: '',
showProtocol: false,
agreeText: '',
detectionData:{},
recordInfo: {
name: '',
sex: '',
......@@ -228,6 +228,7 @@ export default {
};
},
computed: {
...mapGetters(['insuranceInfo', 'orderInfo']),
},
created() {
console.log('--window._picaWechat', window._picaWechat);
......@@ -246,10 +247,10 @@ export default {
serviceCheckType: 1,
validateIdNo: 0,
};
this.detectionData = mock;
this.insuranceInfo = mock;
const { pprotocolType, detectionRecordId } = this.$route.query;
this.getProtocolName(pprotocolType);
this.getRecordInfo(detectionRecordId);
this.getProtocolName(pprotocolType || 31);
this.getRecordInfo(detectionRecordId || 11077);
},
methods: {
clearCode() {
......@@ -273,14 +274,14 @@ export default {
});
},
toggleBindingInfo() {
if(!this.isCheck && this.detectionData.pprotocolType) {
if(!this.isCheck && this.insuranceInfo.pprotocolType) {
this.goProtocol();
}else{
if(this.isCheck && this.barCode) {
const o = {
projectId: this.detectionData.projectId,
projectId: this.insuranceInfo.projectId,
sampleCode: this.barCode,
hospitalId:this.detectionData.hospitalId
hospitalId:this.insuranceInfo.hospitalId
};
this.$loading.show();
sampleCodeValidate(o).then(res => {
......@@ -299,8 +300,8 @@ export default {
},
setSignDetection() {
const obj = {
protocolType: this.detectionData.pprotocolType,
patientId: 212773027
protocolType: this.insuranceInfo.pprotocolType,
patientId: this.orderInfo.beneficiaryPatientId || 212773027
};
signDetection(obj).then(res => {
if (res.code !== '000000') {
......@@ -312,8 +313,7 @@ export default {
},
goProtocol() {
const obj = {
// id: this.detectionData.pprotocolType,
id: 31,
id: this.insuranceInfo.pprotocolType,
};
getProtocolContent(obj).then(res => {
if (res.code !== '000000') {
......@@ -325,7 +325,7 @@ export default {
},
getProtocolName() {
const d = {
id: this.detectionData.pprotocolType
id: this.insuranceInfo.pprotocolType
};
getProtocolName(d).then( res => {
if (res.code !== '000000') {
......@@ -336,8 +336,8 @@ export default {
},
subProtocol() {
const obj = {
protocolType: this.detectionData.pprotocolType,
patientId: 212773027
protocolType: this.insuranceInfo.pprotocolType,
patientId: this.orderInfo.beneficiaryPatientId || 212773027
};
signDetection(obj).then(res => {
if (res.code !== '000000') {
......@@ -369,7 +369,7 @@ export default {
const obj = {
barCode: this.barCode,
id: this.recordID,
prototypeId: this.detectionData.pprotocolType ? this.detectionData.pprotocolType : 0,
prototypeId: this.insuranceInfo.pprotocolType ? this.insuranceInfo.pprotocolType : 0,
prototypeLogId: this.prototypeLogId ? this.prototypeLogId : 0,
};
bindingSampleCode(obj).then(res => {
......
......@@ -152,19 +152,20 @@
</div>
</div>
</div>
<!-- v-if="[1, 3].includes(dataDetail.status)"-->
<!-- v-if="[1, 3].includes(dataDetail.status)"-->
<div
class="submit-container multi-sub-wrap"
>
<div
class="submit-button"
:class="[3].includes(dataDetail.status) && 'multi-sub-wrap'"
@click="bottomBtnFun(dataDetail.status)"
@click="bottomBtnFun(dataDetail.reportUrl)"
>
{{ dataDetail.status | showBtnTextFilter }}
查看报告
</div>
<!-- v-if="[3].includes(dataDetail.status)"-->
<div
v-if="picaWechat == 'wechat'"
class="submit-button"
>
<wx-open-launch-weapp
......@@ -175,10 +176,13 @@
:extra-data="openWebAppConfig.extraData"
>
<script type="text/wxtag-template">
<style>.btn {position:absolute; top: 0; color: #ffffff;text-align: center;line-height: 40px; left: 0; width:100%; height: 100%;}</style> <div class="btn">{{ }}</div>
<style>.btn {position:absolute; top: 0; color: #ffffff;text-align: center;line-height: 40px; left: 0; width:100%; height: 100%;}</style> <div class="btn">{{dataDetail.status | showBtnTextFilter}}</div>
</script>
</wx-open-launch-weapp>
</div>
<div v-else class="submit-button" @click="getJumpToWebapp">
{{dataDetail.status | showBtnTextFilter}}
</div>
</div>
</div>
</template>
......@@ -313,20 +317,14 @@ export default {
}
});
},
// 查看报告
seeReport() {
// window.open(this.dataDetail.reportUrl + '?response-content-type=application/pdf');
const l =
this.dataDetail.reportUrl + '?response-content-type=application/pdf';
this.$DDObj.ddOpenLink({ url: l });
},
bottomBtnFun(s) {
const p = s == 1 ? '/insuranceBindCode' : '/pdf-preview';
bottomBtnFun(u) {
// const p = s == 1 ? '/insuranceBindCode' : '/pdf-preview';
const p = '/pdf-preview';
this.$router.push(
{
path: p,
query: {
id: '',
url: u || 'https://file.yunqueyi.com/bioHope/reports/202302/20230215165058_2axd021dy0.pdf?response-content-type=application/pdf&1676514088161',
},
}
);
......
......@@ -63,7 +63,7 @@
</template>
<script>
import {getButtonStatus} from '@/api/question';
import {getButtonStatus, getJumpPageStatus} from '@/api/question';
export default {
data() {
return {
......@@ -102,7 +102,7 @@ export default {
console.log(11223);
const { query } = this.$route;
this.query = query;
this.getButtonStatus(query.yunOrderNo);
this.getJumpPageStatus();
},
methods: {
statusMap(status) {
......@@ -116,13 +116,26 @@ export default {
};
return m[status];
},
// 获取跳转状态
getJumpPageStatus() {
getJumpPageStatus(this.orderNo, this.projectEquityNo).then(res => {
// console.log('res', getJumpPageStatus);
if (res.code == '000000') {
this.yunOrderNo = res.data.yunOrderNo;
this.query.yunOrderNo = res.data.yunOrderNo;
this.status = res.data.status;
this.needDetect = this.status === '0401';
this.getButtonStatus(res.data.yunOrderNo);
}
});
},
// 去预约
toAppoint() {
if (this.buttonStatus) {
const {projectEquityNo, orderNo, yunOrderNo} = this.query;
const {projectEquityNo, orderNo, yunOrderNo} = this;
this.$router.push({
path: '/appoint',
path: this.routerMap[this.status],
query: {projectEquityNo, orderNo, yunOrderNo},
});
}
......
......@@ -62,8 +62,9 @@
},
created() {
const {name, url} = this.$route.query;
console.log('--url', url);
this.pdfname = name;
this.pdfUrl = url || 'https://file.yunqueyi.com/bioHope/reports/202302/20230215165058_2axd021dy0.pdf?response-content-type=application/pdf&1676514088161';
this.pdfUrl = url;
},
mounted() {
this._loadFile(this.pdfUrl);
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册