Merge branch 'feature/zl' into 'release'

Feature/zl

See merge request !185

src/api/appoint.js

@@ -35,6 +35,7 @@ export const getDetailByYunOrderNo = async (yunOrderNo) => {
     method: 'get',
     url: `/tis/insurance/getDetailByYunOrderNo?yunOrderNo=${yunOrderNo}`,
     withCredentials: true,
+    hasLoading:false,
   });
 };
 export const getHospitalList = async(data) => {

src/api/detection.js

@@ -103,6 +103,9 @@ export const detectionRecordInfo = (data) => {
     method: 'get',
     url: `/trade/detection/record/record/infoV2?detectionRecordId=${data.detectionRecordId}&detectionKind=${data.detectionKind}`,
     withCredentials: true,
+    headers: {
+      hasLoading:false,
+    },
   });
 };
 

src/components/loading/loading.js

@@ -13,7 +13,6 @@ const loading = {
     document.body.appendChild(instance.$el);
 
     // 在Vue的原型链上注册方法，控制组件
-
     Vue.prototype.$loading = {
       show: (text) => {
         instance.show = true;

src/plugins/httpExtension.js

@@ -12,7 +12,7 @@ $http.setOptions({
     console.log('我重写了默认的loading1', opt);
     const globalLoading = document.getElementById('globalLoading');
     if (!globalLoading && !noLoading) {
-      vueApp.$loading.show();
+      // vueApp.$loading.show();
     }
   }
 });
@@ -22,7 +22,7 @@ $http.addBeforeHook(config => console.log('我是新增的前置钩子', config)
 
 // 新增后置钩子
 $http.addAfterHook(response => {
-  vueApp.$loading.hide();
+  // vueApp.$loading.hide();
   if (response.data.code !== '000000') {
     console.log('我是新增的后置钩子111', response);
     vueApp.$toast(response.data.message );

src/views/appoint-demo/index.vue

@@ -223,6 +223,7 @@ export default {
           console.log('--res', res);
           this.orgData = res.data;
         }
+        this.$loading.hide();
       });
     },
     selectTimes(times) {

src/views/appoint/index.vue

@@ -304,7 +304,6 @@ export default {
     },
   },
   mounted() {
-
     this.$loading.show();
     const { yunOrderNo, projectEquityNo } = this.$route.query;
     this.yunOrderNo = yunOrderNo;
@@ -518,7 +517,6 @@ export default {
           message: this.buttonText,
           confirmButtonColor:'#00bda5'
         });
-
       });
     },
     confirm(values) {

src/views/appointDetails/index.vue

@@ -258,7 +258,6 @@ export default {
     console.log('yunOrderNo', yunOrderNo);
     this.getDetailByYunOrderNo(yunOrderNo);
     this.getDetectionName(yunOrderNo);
-    this.$loading.hide();
     this.$sendBuriedData({
       action: 'ACTION_WEB_AFTER',
       component_tag: '7802855#0#0#预约详情',

src/views/insurance-bind-code/insurance-bind-code.vue

@@ -413,6 +413,7 @@ export default {
         prototypeId: this.pprotocolType,
         prototypeLogId: this.prototypeLogId,
       };
+      this.$loading.show();
       console.log('--obj--', obj);
       if(this.insuranceInfo.detectionKind == 1) {
         this.quickBindingCode(obj);
@@ -450,6 +451,7 @@ export default {
               }
             );
           }
+          this.$loading.hide();
           this.$toast('提交成功');
         }
       });
@@ -469,6 +471,7 @@ export default {
               },
             }
           );
+          this.$loading.hide();
           this.$toast('提交成功');
         }
       });

src/views/insurance-detection-detail/index.scss

@@ -274,7 +274,6 @@
     position: relative;
     height: 40px;
     border-radius: 20px;
-    font-weight: 700;
     color: #ffffff;
     font-size: 16px;
     display: flex;
@@ -296,6 +295,19 @@
     padding: 0px 20px;
     min-width: 60px;
   }
+  .submit-button2{
+    position: relative;
+    height: 40px;
+    border-radius: 20px;
+    color: #ffffff;
+    font-size: 16px;
+    display: flex;
+    align-items: center;
+    background: #00bda5;
+    justify-content: center;
+    padding: 0px 20px;
+    min-width: 80%;
+  }
   .btn-label{
     width: 62px;
     height: 14px;

src/views/insurance-detection-detail/insurance-detection-detail.vue

@@ -220,11 +220,21 @@
         阳性报销
       </div>
     </div>
+    <div v-else class="submit-container multi-sub-wrap">
+      <div
+        class="submit-button2"
+        @click="getReport()"
+      >
+        获取报告
+      </div>
+    </div>
   </div>
 </template>
 <script>
 import { getDetectionDetailProces, getJumpToWebapp, detectionRecordInfo } from '@/api/detection';
 const { VUE_APP_ENV } = process.env;
+import axios from 'axios';
+import {getDetailByYunOrderNo} from '@/api/appoint';
 // 0待完善信息、1待采样、2已采样、21已送检、22快递已签收、 25实验室已收样、 27已上机、 3已完成、5样本失效、 6待支付
 export default {
   filters: {
@@ -343,6 +353,7 @@ export default {
         } else {
           that.$toast(res.message);
         }
+        this.$loading.hide();
       });
     },
     copyText(val) {
@@ -451,6 +462,36 @@ export default {
       }
       return t;
     },
+    getReport() {
+      this.$loading.show('报告生成中,请稍等...');
+      getDetailByYunOrderNo(this.yunOrderNo).then(res => {
+        console.log(res);
+        const {showFlagForReport} = res.data;
+        if(showFlagForReport == 1) {
+          const p = {
+            env: VUE_APP_ENV == 'production' ? 'prod' : 'test1',
+            sample_code: this.dataDetail.sampleCode,
+            res_type: 1
+          };
+          //
+          axios.post('https://project.picahealth.com/auto_set_detection_report', p)
+            .then(res => {
+              console.error('请求menu接口失败error', res);
+              const {errorMessage} = res.data.data;
+              this.$toast(errorMessage);
+              this.init();
+            }).catch(error => {
+            console.error('请求menu接口失败error', error);
+            const {errorMessage} = error.data.data;
+            this.$toast(errorMessage);
+            this.init();
+          });
+        }else {
+          this.$loading.hide();
+        }
+        console.log('--showFlagForReport', showFlagForReport);
+      });
+    },
   },
 };
 </script>

src/views/insurance-question-result-pay/insuranceQuestionResult.vue

@@ -27,9 +27,9 @@
                 <div class="tips-item-dot" />
                 早期检出、早期干预、实现可逆
               </div>
-              <div class="tips-item">
+              <div v-if="insuranceInfo.positiveReimburse == 0 && insuranceInfo.reimburseMax > 0" class="tips-item">
                 <div class="tips-item-dot" />
-                检测报告阳性，最高可报销300元复查费用
+                检测报告阳性，最高可报销{{ (insuranceInfo.reimburseMax / 100).toFixed(0) }}元复查费用
               </div>
             </div>
             <div
@@ -118,7 +118,6 @@ export default {
   },
   mounted() {
     const { query } = this.$route;
-    this.$loading.show();
     this.query = query;
     this.yunOrderNo = query.yunOrderNo;
     this.getDetectionName(query.yunOrderNo);
@@ -127,7 +126,6 @@ export default {
       component_tag: '7802850#0#0#问卷结果页面',
       web_data:{yunOrderNo: this.yunOrderNo},
     });
-    this.$loading.hide();
   },
   methods: {
     statusMap(status) {

src/views/insurance-question-result/insuranceQuestionResult.vue

@@ -27,9 +27,9 @@
                 <div class="tips-item-dot" />
                 早期检出、早期干预、实现可逆
               </div>
-              <div class="tips-item">
+              <div v-if="detectionDetail.positiveReimburse == 0 && detectionDetail.reimburseMax > 0" class="tips-item">
                 <div class="tips-item-dot" />
-                检测报告阳性，最高可报销300元复查费用
+                检测报告阳性，最高可报销{{ (detectionDetail.reimburseMax / 100).toFixed(0) }}元复查费用
               </div>
             </div>
             <div
@@ -115,6 +115,7 @@ export default {
       query: {},
       buttonStatus: false,
       buttonText:'',
+      detectionDetail:{}
     };
   },
   computed: {
@@ -152,10 +153,11 @@ export default {
      getDetectionName(yunOrderNo) {
       getDetectionName(yunOrderNo).then(res => {
         if (res.code === '000000' && res.data) {
-          const dectionData = res.data[0] || {};
-          console.log('dectionData.detectionName', this.insuranceInfo, dectionData);
-          this.detectionName = dectionData.detectionName;
-          this.$store.dispatch('home/setInsuranceInfo', dectionData);
+          const d = res.data[0] || {};
+          this.detectionDetail = d || {};
+          console.log('dectionData.detectionName', this.insuranceInfo, d);
+          this.detectionName = d.detectionName;
+          this.$store.dispatch('home/setInsuranceInfo', d);
           this.$loading.hide();
         }
       });

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     port: 8083,
     proxy: {
       '/proxy': {
-        target: 'https://test1-sc.yunqueyi.com/',
+        target: 'https://dev-sc.yunqueyi.com/',
         // target: 'https://test1-sc.yunqueyi.com/',
         // target: 'https://uat-sc.yunqueyi.com/',
         // http://10.241.65.90:3000/mock/1071/cs/route/removeUser