提交 5aedf407 编写于 作者: liangliang.yu's avatar liangliang.yu

feat: point data report

上级 d069d0ba
#!/bin/bash #!/bin/bash
hasGit=`which git` # 判断是否存在git hasGit=`which git` # 判断是否存在git
msg=${1:-'auto commit'} # 获取终端输入的第一个参数,若为空则为auto commit msg=${1:-'auto commit'} # 获取终端输入的第一个参数,若为空则为auto commit
originBranch='origin/develop' originBranch='origin/release'
if [ ! $hasGit ];then if [ ! $hasGit ];then
echo 'Please download git first!'; echo 'Please download git first!';
exit 1; exit 1;
......
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
v-if="bindFlag>0" v-if="bindFlag>0"
class="detail-btn" class="detail-btn"
@click="bindingCode" @click="bindingCode"
> >
绑定{{ 绑定{{
insuranceInfo && insuranceInfo.detectionKind == 0 insuranceInfo && insuranceInfo.detectionKind == 0
...@@ -265,6 +265,7 @@ export default { ...@@ -265,6 +265,7 @@ export default {
verificationCode: '', verificationCode: '',
intervalId: null, intervalId: null,
status: '', status: '',
allowChangeTimes: 0,
bindFlag:1, // 是否显示绑定条形码的按钮 bindFlag:1, // 是否显示绑定条形码的按钮
}; };
}, },
...@@ -276,10 +277,15 @@ export default { ...@@ -276,10 +277,15 @@ export default {
this.detailInfo.hospitalRemarks !== '' this.detailInfo.hospitalRemarks !== ''
); );
}, },
canReappoint() {
return (
this.detailInfo.detectionKind == 1 && this.detailInfo.allowChangeTimes > 0
);
}
}, },
created() { created() {
this.dataRefreh(); this.dataRefreh();
}, },
mounted() { mounted() {
...@@ -338,6 +344,7 @@ export default { ...@@ -338,6 +344,7 @@ export default {
sampleCode, sampleCode,
externalOrderNo, externalOrderNo,
projectEquityNo, projectEquityNo,
allowChangeTimes,
bindFlag, bindFlag,
} = res.data; } = res.data;
this.detailInfo = res.data; this.detailInfo = res.data;
...@@ -345,6 +352,7 @@ export default { ...@@ -345,6 +352,7 @@ export default {
this.isUnderLine = res.data.detectionCategory == 2; this.isUnderLine = res.data.detectionCategory == 2;
this.qrcodeUrl = qrCodeUrl; this.qrcodeUrl = qrCodeUrl;
this.verificationCode = verificationCode; this.verificationCode = verificationCode;
this.allowChangeTimes = allowChangeTimes;
this.bindFlag = bindFlag; // 是否展示绑定条形码功能 this.bindFlag = bindFlag; // 是否展示绑定条形码功能
if (window._miniprogram) { if (window._miniprogram) {
if (status != '0202') { if (status != '0202') {
...@@ -412,11 +420,11 @@ export default { ...@@ -412,11 +420,11 @@ export default {
component_tag: '7802855#0#0#重新预约', component_tag: '7802855#0#0#重新预约',
web_data: { yunOrderNo: this.yunOrderNo }, web_data: { yunOrderNo: this.yunOrderNo },
}); });
const { detectionKind } = this.insuranceInfo;
console.log('detectionKind--', detectionKind);
if (window._miniprogram) { if (window._miniprogram) {
const u = this.canReappoint ? '/pagesInsurance/sz-insurance/appoint' : '/pagesInsurance/sz-insurance/screeningAppoint';
this.clear();
this.$rocNative.WXInstance.miniProgram.navigateTo({ this.$rocNative.WXInstance.miniProgram.navigateTo({
url: `/pagesInsurance/sz-insurance/screeningAppoint?yunOrderNo=${that.yunOrderNo}&projectEquityNo=${this.projectEquityNo}`, url: `${u}?allowChangeFlagType=offline&yunOrderNo=${that.yunOrderNo}&projectEquityNo=${this.projectEquityNo}`,
}); });
} else { } else {
this.$router.push({ this.$router.push({
...@@ -534,6 +542,7 @@ export default { ...@@ -534,6 +542,7 @@ export default {
}); });
if (window._miniprogram) { if (window._miniprogram) {
const { detectionKind } = this.insuranceInfo; const { detectionKind } = this.insuranceInfo;
this.clear();
this.$rocNative.WXInstance.miniProgram.navigateTo({ this.$rocNative.WXInstance.miniProgram.navigateTo({
url: `/pages/health/binding-code/index?yunOrderNo=${this.yunOrderNo}&projectEquityNo=${this.projectEquityNo}&detectionRecordId=${detectionServiceRecordId}&pprotocolType=${pprotocolType}&channelSource=insurance_channel&detectionKind=${detectionKind}`, url: `/pages/health/binding-code/index?yunOrderNo=${this.yunOrderNo}&projectEquityNo=${this.projectEquityNo}&detectionRecordId=${detectionServiceRecordId}&pprotocolType=${pprotocolType}&channelSource=insurance_channel&detectionKind=${detectionKind}`,
}); });
...@@ -916,7 +925,6 @@ export default { ...@@ -916,7 +925,6 @@ export default {
left: 16px; left: 16px;
right: 16px; right: 16px;
} }
} }
.insurance-detection { .insurance-detection {
background: #ffffff; background: #ffffff;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册