Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !98

src/views/appoint/index.vue

@@ -30,12 +30,15 @@
           <van-field
             label="受检人信息"
             required
+            disabled
+
             class="appoint-form-title"
           />
           <van-field
             v-model="dectionForm.beneficiaryName"
             label="受检人"
             :disabled="isDisabled"
+            clearable
             class="appoint-form-items"
             placeholder="请输入受检人姓名"
             :rules="[{ required: true, message: '请输入受检人姓名' },{
@@ -52,6 +55,7 @@
             class="appoint-form-items"
             :disabled="isDisabled"
             label="手机号"
+            clearable
             placeholder="请输入受检人手机号"
             :rules="[{ required: true, message: '请输入受检人手机号' },
                      {
@@ -63,6 +67,7 @@
             v-model="dectionForm.beneficiaryIdNum"
             :disabled="isDisabled"
             class="appoint-form-items"
+            clearable
             label="身份证号"
             placeholder="请输入受检人真实身份证号"
             :rules="[{ required: true, message: '请输入受检人真实身份证号' },
@@ -167,6 +172,7 @@
         @click="appointment"
       >
         提交
+        {{ buttonStatus ? '提交' : buttonText }}
       </van-button>
     </div>
     <SelectHospital
@@ -203,7 +209,7 @@ import {getDetectionName, getOrderInfo, appointment, getHospitalList} from '@/ap
 import SelectHospital from '@/components/selectHospital/index.vue';
 import SelectTime from '@/components/selectTime/index.vue';
 import PickArea from '@/components/pickArea/index.vue';
-import { getJumpPageStatus } from '@/api/question';
+import { getJumpPageStatus, getButtonStatus} from '@/api/question';
 import storejs from 'storejs';
 import AMapLoader from '@amap/amap-jsapi-loader';
 export default {
@@ -267,7 +273,9 @@ export default {
       yunOrderNo: '',
       externalData: {},
       isDisabled: false,
-      stock:false,
+      stock: false,
+      buttonStatus: false,
+      buttonText: '',
     };
   },
   computed: {
@@ -290,7 +298,8 @@ export default {
         this.dectionForm.beneficiaryName &&
         this.dectionForm.beneficiaryPhone &&
         this.yunOrderNo &&
-        this.stock
+        this.stock &&
+        this.buttonStatus
 
       );
     },
@@ -310,6 +319,7 @@ export default {
     this.getDetectionName(yunOrderNo);
     this.getOrderInfo(yunOrderNo);
     this.getJumpPageStatus(data);
+    this.getButtonStatus(yunOrderNo);
     this.initMap();
   },
   methods: {
@@ -489,6 +499,15 @@ export default {
         console.log(err);
       });
     },
+    // 获取按钮状态
+    getButtonStatus(yunOrderNo) {
+      getButtonStatus(yunOrderNo).then(res => {
+        console.log(res);
+        this.buttonStatus = res.data.buttonStatus;
+        this.buttonText = res.data.statusDesc;
+        this.$loading.hide();
+      });
+    },
     getDetailByUnionId() { },
     confirm(values) {
       console.log('confirm', values);