Merge branch 'feature/zl2' into 'develop'

auto commit

See merge request !16

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

@@ -141,6 +141,7 @@
       show-cancel-button="true"
       confirm-button-text="确认提交"
       cancel-button-text="返回修改"
+      @confirm="toBindSuccess"
     >
       <div class="binding-code-showInfo">
         <div class="title">
@@ -205,7 +206,7 @@ export default {
       showBindingInfo: true,
       showEditModal: false,
       isCheck: false,
-      barCode: '123213123123123',
+      barCode: '020987654321',
       protocolName: '',
       prototypeId: '',
       prototypeLogId: '',
@@ -268,7 +269,16 @@ export default {
     clearCode() {
       this.barCode = '';
     },
-    scanCode() {},
+    scanCode() {
+      window.wx && window.wx.scanQRCode({
+        needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+        scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+        success: function (res) {
+          console.log('---res', res);
+          // var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+        }
+      });
+    },
     toggleBindingInfo() {
       if(!this.isCheck && this.detectionData.pprotocolType) {
         this.goProtocol();
@@ -378,6 +388,16 @@ export default {
         }
       });
     },
+    toBindSuccess() {
+      this.$router.push(
+        {
+          path:  '/insuranceBindCodeSuccess',
+          query: {
+            id: this.projectId,
+          },
+        }
+      );
+    }
   }
 };
 

src/views/insurance-bindCode-success/index.scss

@@ -135,6 +135,7 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
+    margin-top: 60px;
     .sumbit-button {
       width: 352px;
       height: 40px;

src/views/insurance-bindCode-success/insurance-bindCode-success.vue

@@ -79,7 +79,7 @@
   </div>
 </template>
 <script>
-import { getDetectionDetail, getDetectionDetailProces } from '@/api/detection';
+import { getDetectionDetail } from '@/api/detection';
 export default {
   filters: {
     sexFilter(val) {
@@ -112,50 +112,30 @@ export default {
       getDetectionDetail(this.id).then((res) => {
         if (res.code === '000000') {
           this.dataDetail = res.data;
-          this.getDetailProces();
-          console.log(res, 'eeeeeeeeeee', this.dataDetail);
         } else {
           this.$toast(res.message);
         }
       });
     },
-    sampleDetection() {
-      // 样本送检测sale-mall-crm/sample-inspection?hospitalId=58436
+    // 检测详情
+    bottomBtnFun() {
       this.$router.push({
-        name: 'SampleInspection',
+        path: '/insuranceDetectionDetail',
         query: {
-          hospitalId: this.dataDetail.hospitalId,
+          id: 11073,
         },
       });
     },
-    // 检测详情
-    getDetailProces() {
-      getDetectionDetailProces(this.id).then((res) => {
-        if (res.code === '000000') {
-          var flag = false;
-          const data = res.data || [];
-          console.log(this.dataDetail);
-          data.forEach((item) => {
-            if (item.status == this.dataDetail.status) {
-              item.complate = false;
-              flag = true;
-            } else {
-              console.log(flag, 'flag');
-              if (!flag) {
-                item.complate = true;
-              } else {
-                item.complate = false;
-              }
-            }
-          });
-          this.dataList = data;
-          console.log(this.dataList, 'res111111');
-        } else {
-          this.$toast(res.message);
-        }
-      });
-    },
-    bottomBtnFun() {
+    copyText(item) {
+      const input = document.createElement('input');
+      input.value = item;
+      document.body.appendChild(input);
+      input.select();
+      input.setSelectionRange(0, input.value.length);
+      document.execCommand('Copy');
+      document.body.removeChild(input);
+      this.$toast('已复制');
+      window.scrollTo(0, 1);
     },
   },
 };

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

@@ -278,15 +278,6 @@ export default {
       console.log('已复制的内容：', val);
       window.scrollTo(0, 1);
     },
-    sampleDetection() {
-      // 样本送检测sale-mall-crm/sample-inspection?hospitalId=58436
-      this.$router.push({
-        name: 'SampleInspection',
-        query: {
-          hospitalId: this.dataDetail.hospitalId,
-        },
-      });
-    },
     // 检测详情
     getDetailProces() {
       getDetectionDetailProces(this.id).then((res) => {
@@ -324,16 +315,6 @@ export default {
     },
     bottomBtnFun() {
       // 底部按钮点击
-      const objFun = {
-        3: 'seeReport', // 已完成 查看报告
-        // 1: 'goBindCode', // 待采样 绑定条形码
-        // 6: 'goPay', // 去支付
-        2: 'sampleDetection', // 去送检
-      };
-      console.log(this.dataDetail.status);
-      const funName = objFun[this.dataDetail.status];
-      console.log(funName);
-      funName && this[funName]();
     },
   },
 };