提交 5fbad512 编写于 作者: 张磊's avatar 张磊

quick detect

上级 11dffe0a
......@@ -29,20 +29,20 @@
<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>
!(function(c,b,d,a){c[a]||(c[a]={});c[a].config=
{
pid:"bj53rb58f5@29641a9002f6545",
appType:"web",
imgUrl:"https://arms-retcode.aliyuncs.com/r.png?",
sendResource:true,
enableLinkTrace:true,
behavior:true,
useFmp:true,
enableSPA:true,
enableConsole:true
};
with(b)with(body)with(insertBefore(createElement("script"),firstChild))setAttribute("crossorigin","",src=d)
})(window,document,"https://retcode.alicdn.com/retcode/bl.js","__bl");
// !(function(c,b,d,a){c[a]||(c[a]={});c[a].config=
// {
// pid:"bj53rb58f5@29641a9002f6545",
// appType:"web",
// imgUrl:"https://arms-retcode.aliyuncs.com/r.png?",
// sendResource:true,
// enableLinkTrace:true,
// behavior:true,
// useFmp:true,
// enableSPA:true,
// enableConsole:true
// };
// with(b)with(body)with(insertBefore(createElement("script"),firstChild))setAttribute("crossorigin","",src=d)
// })(window,document,"https://retcode.alicdn.com/retcode/bl.js","__bl");
</script>
</body>
</html>
import request from 'mn-template/plugins/http';
// 获取检测详情 接口
export const getDetectionDetail = (id) => {
return request({
method: 'get',
url: `/trade/detection/record/record/info/?detectionRecordId=${id}&userType=0`,
withCredentials: true,
});
};
// 获取检测详情 接口
export const getQuickDetectionDetail = (id) => {
return request({
method: 'get',
url: `/trade/detection/record/quick/info/?detectionRecordId=${id}&userType=0`,
withCredentials: true,
});
};
// 检测详情节点查询
export const getDetectionDetailProces = (data) => {
return request({
......@@ -109,7 +93,7 @@ export const sampleCodeValidate = (data) => {
export const detectionRecordInfo = (data) => {
return request({
method: 'get',
url: `/trade/detection/record/record/info?detectionRecordId=${data.detectionRecordId}&detectionKind=${data.detectionKind}`,
url: `/trade/detection/record/record/infoV2?detectionRecordId=${data.detectionRecordId}&detectionKind=${data.detectionKind}`,
withCredentials: true,
});
};
......@@ -126,7 +110,7 @@ export const detectionQuickRecordInfo = (id) => {
// 绑定条码
export const bindingSampleCode = (data) => {
return request({
url: '/trade/detection/applet/record/record/bindingSampleCode',
url: '/trade/detection/applet/record/record/bindingSampleCodeV2',
method: 'POST',
data: data,
});
......@@ -134,7 +118,7 @@ export const bindingSampleCode = (data) => {
export const bindingQuickSampleCode = (data) => {
return request({
url: '/trade/detection/applet/record/record/bindingQuickSampleCode',
url: '/trade/detection/applet/record/record/bindingSampleCodeV2',
method: 'POST',
data: data,
});
......
......@@ -16,7 +16,6 @@
<van-form
ref="dectionForm"
validate-first
@submit="onSubmit"
>
<van-field
name="checkboxGroup"
......
......@@ -91,11 +91,13 @@
class="tip-grey"
>
<div class="tip-grey-dot" />
请在预约日期前往预约医院完成采样。无需空腹,采样前三天可适当清淡饮食;
{{insuranceInfo && insuranceInfo.detectionKind == 0 ? '请在预约日期前往预约医院完成采样。无需空腹,采样前三天可适当清淡饮食;' : '请在预约日前往现场领取产品;' }}
</div>
<div class="tip-grey">
<div class="tip-grey-dot" />
注意携带好您投保时注册的手机前往,凭手机号扫码确认采样;
{{insuranceInfo && insuranceInfo.detectionKind == 0 ? '注意携带好您投保时注册的手机前往,凭手机号扫码确认采样;' : '注意携带好投保时注册的手机前往,凭手机号扫码确认领取成功;' }}
</div>
<div v-if="insuranceInfo && insuranceInfo.detectionKind == 0" class="tip-grey">
<div class="tip-grey-dot" />
......@@ -160,12 +162,6 @@
href="tel:400-006-5252"
>400-006-5252</a>
</div>
<!-- <div
class="detail-btn"
@click="checkDetail"
>
查看详情
</div> -->
<div
v-if="!expireFlag"
class="detail-btn-bottom"
......
......@@ -380,7 +380,6 @@ export default {
});
},
getRecordInfo() {
const o = {
detectionRecordId: this.detectionRecordId,
detectionKind: this.insuranceInfo.detectionKind
......@@ -398,22 +397,6 @@ export default {
this.recordInfo.hospitalId = res.data.hospitalId;
}
});
// if(this.insuranceInfo.detectionKind == 0) {
//
// }
// if(this.insuranceInfo.detectionKind == 1) {
// detectionQuickRecordInfo(this.detectionRecordId).then(res => {
// if (res.code === '000000') {
// this.recordInfo.name = res.data.patientName;
// this.recordInfo.sex = res.data.sex === 1 ? '男' : '女';
// this.recordInfo.date = res.data.birthday;
// this.recordInfo.checkName = res.data.checkName;
// this.recordInfo.projectId = res.data.projectId;
// this.recordInfo.patientId = res.data.patientId;
// this.recordInfo.hospitalId = res.data.hospitalId;
// }
// });
// }
},
// 绑定条形码
bindingCode() {
......@@ -433,7 +416,7 @@ export default {
},
// 绑定条形码
quickBindingCode(obj) {
const o = {...obj, userId:this.recordInfo.patientId};
const o = {...obj, userId:this.recordInfo.patientId, detectionKind: 1};
bindingQuickSampleCode(o).then(res => {
if (res.code !== '000000') {
return this.$toast(res.message);
......@@ -453,7 +436,8 @@ export default {
},
earlyBindingCode(obj) {
// quickBindingCode userId
bindingSampleCode(obj).then(res => {
const o = {...obj, detectionKind: 0};
bindingSampleCode(o).then(res => {
if (res.code !== '000000') {
return this.$toast(res.message);
} else {
......
......@@ -87,7 +87,7 @@
</div>
</template>
<script>
import { getDetectionDetail, getQuickDetectionDetail } from '@/api/detection';
import { detectionRecordInfo } from '@/api/detection';
import {mapGetters} from 'vuex';
import store from 'storejs';
export default {
......@@ -120,31 +120,19 @@ export default {
const {detectionRecordId, yunOrderNo} = this.$route.query;
this.detectionRecordId = detectionRecordId;
this.yunOrderNo = yunOrderNo;
this.init();
this.detectionRecordInfo();
},
mounted() {
},
methods: {
init() {
detectionRecordInfo() {
const in_info = store.get('insuranceInfo');
if(in_info.detectionKind == 1) {
this.getQuickDetectionDetail();
}
if(in_info.detectionKind == 0) {
this.getDetectionDetail();
}
},
getQuickDetectionDetail() {
getQuickDetectionDetail(this.detectionRecordId).then((res) => {
if (res.code === '000000') {
this.dataDetail = res.data;
} else {
this.$toast(res.message);
}
});
},
getDetectionDetail() {
getDetectionDetail(this.detectionRecordId).then((res) => {
const o = {
detectionRecordId: this.detectionRecordId,
detectionKind: in_info.detectionKind
};
detectionRecordInfo(o).then((res) => {
if (res.code === '000000') {
this.dataDetail = res.data;
} else {
......
......@@ -188,7 +188,7 @@
</div>
</template>
<script>
import { getDetectionDetail, getDetectionDetailProces, getJumpToWebapp } from '@/api/detection';
import { getDetectionDetailProces, getJumpToWebapp, detectionRecordInfo } from '@/api/detection';
// 0待完善信息、1待采样、2已采样、21已送检、22快递已签收、 25实验室已收样、 27已上机、 3已完成、5样本失效、 6待支付
export default {
filters: {
......@@ -260,8 +260,13 @@ export default {
targetPath: 'pagesInsurance/all-entrance/index',
query: {yunOrderNo: this.yunOrderNo},
};
const o = {
detectionRecordId: this.detectionRecordId,
detectionKind: 0
};
console.log('----detectionRecordInfo', o);
let jump_path = `pagesInsurance/all-entrance/index?yunOrderNo=${this.yunOrderNo}&channelSource=channelSource`;
getDetectionDetail(this.detectionRecordId).then((res) => {
detectionRecordInfo(o, 0).then((res) => {
if (res.code === '000000') {
this.dataDetail = res.data;
this.getDetailProces();
......
......@@ -47,7 +47,7 @@
>
<div class="info-tips">
点击上方按钮预约,并前往预约的医疗机构采样
{{insuranceInfo && insuranceInfo.detectionKind == 0 ? '点击上方按钮预约,并前往预约的医疗机构采样' : '点击上方按钮预约,并前往预约的医疗机构领取产品'}}
</div>
</template>
<template v-else>
......@@ -76,7 +76,7 @@
<div
class="tips-fixed"
>
注:该问卷评估结果仅供填写人自行参考。
注:请填写人根据问卷评估结果自主选择后续
</div>
</div>
</div>
......@@ -173,8 +173,9 @@ export default {
<style lang="scss" scoped>
.insuranceQuestionResult-box{
height: 100vh;
min-height: 100vh;
background: #F3FCFF;
padding-bottom: 50px;
}
.insuranceQuestionResult {
width: 100%;
......@@ -356,7 +357,6 @@ background: #F3FCFF;
bottom: 70px;
height: 21px;
font-size: 13px;
font-family: PingFangSC-Light, PingFang SC;
font-weight: 300;
color: #999999;
line-height: 21px;
......
......@@ -125,7 +125,7 @@
class="submit-container multi-sub-wrap"
>
<div
v-if="picaWechat == 'wechat' && [3].includes(dataDetail.status)"
v-if="false"
class="submit-button"
>
<wx-open-launch-weapp
......@@ -151,7 +151,7 @@
</div>
</template>
<script>
import { getQuickDetectionDetail, getQuickDetectionDetailProces, getJumpToWebapp } from '@/api/detection';
import { getQuickDetectionDetailProces, getJumpToWebapp, detectionRecordInfo } from '@/api/detection';
// 0待完善信息、1待采样、2已采样、21已送检、22快递已签收、 25实验室已收样、 27已上机、 3已完成、5样本失效、 6待支付
export default {
filters: {
......@@ -215,7 +215,12 @@ export default {
targetPath: 'pagesInsurance/all-entrance/index',
query: {yunOrderNo: this.yunOrderNo},
};
getQuickDetectionDetail(this.detectionRecordId).then((res) => {
const o = {
detectionRecordId: this.detectionRecordId,
detectionKind: 1
};
console.log('----detectionRecordInfo', o);
detectionRecordInfo(o).then((res) => {
if (res.code === '000000') {
this.dataDetail = res.data;
this.getDetailProces();
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册