Merge branch 'develop' of...

Merge branch 'develop' of http://192.168.110.53/com.pica.cloud.frontend/pica-insurance into feature/zjx

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

 <template>
-  <div class="insurance-binding-code-container">
+  <div class="insurance-binding-code-container" :class="picaWechat == 'wechat' && 'mt20'">
     <page-model
       v-if="picaWechat != 'wechat'"
       ref="PageModel"
       :header-info="headerInfo"
     />
-    <div class="code-container" :class="picaWechat == 'wechat' && 'mt20'">
+    <div class="code-container">
       <div class="code-content">
         <div class="code-input-item-l detection-container">
           <div class="input-title">
@@ -270,7 +270,7 @@ export default {
         if(this.isCheck && this.barCode) {
           const o = {
             projectId: this.recordInfo.projectId,
-            sampleCode: this.barCode,
+            sampleCode: String(this.barCode).toUpperCase(),
             hospitalId:this.recordInfo.hospitalId
           };
           this.$loading.show();
@@ -383,6 +383,8 @@ export default {
       console.log('--obj--', obj);
       bindingSampleCode(obj).then(res => {
         if (res.code !== '000000') {
+          return this.$toast(res.message);
+        } else {
           this.$router.push(
             {
               path:  '/insuranceBindCodeSuccess',
@@ -392,8 +394,6 @@ export default {
               },
             }
           );
-          return this.$toast(res.message);
-        } else {
           this.$toast('提交成功');
         }
       });
@@ -722,7 +722,7 @@ export default {
       white-space: nowrap;
     }
   }
-  .mt20{margin-top: 20px}
 }
+.mt20{padding-top: 20px}
 </style>
 

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

@@ -61,12 +61,12 @@
               :key="index"
               class="express-step"
               :class="{
-                hideCircle: item.status == dataDetail.status,
+                hideCircle: item.completed,
                 last: index == dataList.length - 1,
               }"
             >
               <div
-                v-if="item.status == dataDetail.status || item.complate"
+                v-if="item.completed"
                 class="express-step-icon"
               >
                 <img