Merge branch 'feature/zl2' into 'develop'

Feature/zl2 See merge request !29

Merge branch 'feature/zl2' into 'develop'
Feature/zl2 See merge request !29
3e4703a3 · 张磊 · 5136a5d5 · 56b2a565 · 3e4703a3 · 3e4703a3
--- a/public/index.html
+++ b/public/index.html
@@ -12,7 +12,7 @@
    <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>

--- a/src/views/insurance-bind-code/insurance-bind-code.vue
+++ b/src/views/insurance-bind-code/insurance-bind-code.vue
@@ -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 => {

--- a/src/views/insurance-detection-detail/insurance-detection-detail.vue
+++ b/src/views/insurance-detection-detail/insurance-detection-detail.vue
@@ -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',
          },
        }
      );

--- a/src/views/pdf-preview/index.vue
+++ b/src/views/pdf-preview/index.vue
@@ -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);