Skip to content

P
pica-insurance
提交 3e4703a3 编写于 作者: 张磊's avatar 张磊
浏览文件
操作

Merge branch 'feature/zl2' into 'develop' 

Feature/zl2

See merge request !29
上级 5136a5d5 56b2a565
隐藏空白字符变更
内嵌 并排
正在显示 包含 31 行增加 和 32 行删除
public/index.html
浏览文件 @ 3e4703a3
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<link rel="dns-prefetch" href="<%= process.env.VUE_APP_SERVICE_URL %>"> <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"> <link rel="icon" type="image/x-icon" href="<%= VUE_APP_OSS_URL %>static/img/logo.png">
<title>云鹊医</title> <title>云鹊医</title>
</head> </head>
<body> <body>
<noscript> <noscript>
......
src/views/insurance-bind-code/insurance-bind-code.vue
浏览文件 @ 3e4703a3
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
type="text" type="text"
class="code" class="code"
> >
{{ detectionData.checkName || '' }} {{ insuranceInfo.checkName || '' }}
</div> </div>
<div class="code-input-item-r"> <div class="code-input-item-r">
<div <div
...@@ -194,6 +194,7 @@ ...@@ -194,6 +194,7 @@
</template> </template>
<script> <script>
import { mapGetters } from 'vuex';
import { signDetection, getProtocolContent, getProtocolName, sampleCodeValidate, detectionRecordInfo, bindingSampleCode} from '@/api/detection.js'; import { signDetection, getProtocolContent, getProtocolName, sampleCodeValidate, detectionRecordInfo, bindingSampleCode} from '@/api/detection.js';
export default { export default {
data() { data() {
...@@ -218,7 +219,6 @@ export default { ...@@ -218,7 +219,6 @@ export default {
detectionRecordId: '', detectionRecordId: '',
showProtocol: false, showProtocol: false,
agreeText: '', agreeText: '',
detectionData:{},
recordInfo: { recordInfo: {
name: '', name: '',
sex: '', sex: '',
...@@ -228,6 +228,7 @@ export default { ...@@ -228,6 +228,7 @@ export default {
}; };
}, },
computed: { computed: {
...mapGetters(['insuranceInfo', 'orderInfo']),
}, },
created() { created() {
console.log('--window._picaWechat', window._picaWechat); console.log('--window._picaWechat', window._picaWechat);
...@@ -246,10 +247,10 @@ export default { ...@@ -246,10 +247,10 @@ export default {
serviceCheckType: 1, serviceCheckType: 1,
validateIdNo: 0, validateIdNo: 0,
}; };
this.detectionData = mock; this.insuranceInfo = mock;
const { pprotocolType, detectionRecordId } = this.$route.query; const { pprotocolType, detectionRecordId } = this.$route.query;
this.getProtocolName(pprotocolType); this.getProtocolName(pprotocolType || 31);
this.getRecordInfo(detectionRecordId); this.getRecordInfo(detectionRecordId || 11077);
}, },
methods: { methods: {
clearCode() { clearCode() {
...@@ -273,14 +274,14 @@ export default { ...@@ -273,14 +274,14 @@ export default {
}); });
}, },
toggleBindingInfo() { toggleBindingInfo() {
if(!this.isCheck && this.detectionData.pprotocolType) { if(!this.isCheck && this.insuranceInfo.pprotocolType) {
this.goProtocol(); this.goProtocol();
}else{ }else{
if(this.isCheck && this.barCode) { if(this.isCheck && this.barCode) {
const o = { const o = {
projectId: this.detectionData.projectId, projectId: this.insuranceInfo.projectId,
sampleCode: this.barCode, sampleCode: this.barCode,
hospitalId:this.detectionData.hospitalId hospitalId:this.insuranceInfo.hospitalId
}; };
this.$loading.show(); this.$loading.show();
sampleCodeValidate(o).then(res => { sampleCodeValidate(o).then(res => {
...@@ -299,8 +300,8 @@ export default { ...@@ -299,8 +300,8 @@ export default {
}, },
setSignDetection() { setSignDetection() {
const obj = { const obj = {
protocolType: this.detectionData.pprotocolType, protocolType: this.insuranceInfo.pprotocolType,
patientId: 212773027 patientId: this.orderInfo.beneficiaryPatientId || 212773027
}; };
signDetection(obj).then(res => { signDetection(obj).then(res => {
if (res.code !== '000000') { if (res.code !== '000000') {
...@@ -312,8 +313,7 @@ export default { ...@@ -312,8 +313,7 @@ export default {
}, },
goProtocol() { goProtocol() {
const obj = { const obj = {
// id: this.detectionData.pprotocolType, id: this.insuranceInfo.pprotocolType,
id: 31,
}; };
getProtocolContent(obj).then(res => { getProtocolContent(obj).then(res => {
if (res.code !== '000000') { if (res.code !== '000000') {
...@@ -325,7 +325,7 @@ export default { ...@@ -325,7 +325,7 @@ export default {
}, },
getProtocolName() { getProtocolName() {
const d = { const d = {
id: this.detectionData.pprotocolType id: this.insuranceInfo.pprotocolType
}; };
getProtocolName(d).then( res => { getProtocolName(d).then( res => {
if (res.code !== '000000') { if (res.code !== '000000') {
...@@ -336,8 +336,8 @@ export default { ...@@ -336,8 +336,8 @@ export default {
}, },
subProtocol() { subProtocol() {
const obj = { const obj = {
protocolType: this.detectionData.pprotocolType, protocolType: this.insuranceInfo.pprotocolType,
patientId: 212773027 patientId: this.orderInfo.beneficiaryPatientId || 212773027
}; };
signDetection(obj).then(res => { signDetection(obj).then(res => {
if (res.code !== '000000') { if (res.code !== '000000') {
...@@ -369,7 +369,7 @@ export default { ...@@ -369,7 +369,7 @@ export default {
const obj = { const obj = {
barCode: this.barCode, barCode: this.barCode,
id: this.recordID, 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, prototypeLogId: this.prototypeLogId ? this.prototypeLogId : 0,
}; };
bindingSampleCode(obj).then(res => { bindingSampleCode(obj).then(res => {
......
src/views/insurance-detection-detail/insurance-detection-detail.vue
浏览文件 @ 3e4703a3
...@@ -152,19 +152,20 @@ ...@@ -152,19 +152,20 @@
</div> </div>
</div> </div>
</div> </div>
<!-- v-if="[1, 3].includes(dataDetail.status)"--> <!-- v-if="[1, 3].includes(dataDetail.status)"-->
<div <div
class="submit-container multi-sub-wrap" class="submit-container multi-sub-wrap"
> >
<div <div
class="submit-button" class="submit-button"
:class="[3].includes(dataDetail.status) && 'multi-sub-wrap'" :class="[3].includes(dataDetail.status) && 'multi-sub-wrap'"
@click="bottomBtnFun(dataDetail.status)" @click="bottomBtnFun(dataDetail.reportUrl)"
> >
{{ dataDetail.status | showBtnTextFilter }} 查看报告
</div> </div>
<!-- v-if="[3].includes(dataDetail.status)"--> <!-- v-if="[3].includes(dataDetail.status)"-->
<div <div
v-if="picaWechat == 'wechat'"
class="submit-button" class="submit-button"
> >
<wx-open-launch-weapp <wx-open-launch-weapp
...@@ -175,10 +176,13 @@ ...@@ -175,10 +176,13 @@
:extra-data="openWebAppConfig.extraData" :extra-data="openWebAppConfig.extraData"
> >
<script type="text/wxtag-template"> <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> </script>
</wx-open-launch-weapp> </wx-open-launch-weapp>
</div> </div>
<div v-else class="submit-button" @click="getJumpToWebapp">
{{dataDetail.status | showBtnTextFilter}}
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -313,20 +317,14 @@ export default { ...@@ -313,20 +317,14 @@ export default {
} }
}); });
}, },
// 查看报告 bottomBtnFun(u) {
seeReport() { // const p = s == 1 ? '/insuranceBindCode' : '/pdf-preview';
// window.open(this.dataDetail.reportUrl + '?response-content-type=application/pdf'); const p = '/pdf-preview';
const l =
this.dataDetail.reportUrl + '?response-content-type=application/pdf';
this.$DDObj.ddOpenLink({ url: l });
},
bottomBtnFun(s) {
const p = s == 1 ? '/insuranceBindCode' : '/pdf-preview';
this.$router.push( this.$router.push(
{ {
path: p, path: p,
query: { query: {
id: '', url: u || 'https://file.yunqueyi.com/bioHope/reports/202302/20230215165058_2axd021dy0.pdf?response-content-type=application/pdf&1676514088161',
}, },
} }
); );
......
src/views/pdf-preview/index.vue
浏览文件 @ 3e4703a3
...@@ -62,8 +62,9 @@ ...@@ -62,8 +62,9 @@
}, },
created() { created() {
const {name, url} = this.$route.query; const {name, url} = this.$route.query;
console.log('--url', url);
this.pdfname = name; 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() { mounted() {
this._loadFile(this.pdfUrl); this._loadFile(this.pdfUrl);
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或