Merge branch 'dev-20210702' into 'release'

Dev 20210702

See merge request !22

src/components/common/appointment-time.vue

@@ -43,7 +43,7 @@
       <!--            </el-row>-->
       <span slot="footer" class="dialog-footer" style="text-align: center;">
                 <el-button @click="cancel">取 消</el-button>
-                <el-button type="primary" @click="confirm">确定</el-button>
+                <el-button type="primary" @click="confirm" :disabled="isClick">确定</el-button>
             </span>
     </el-dialog>
   </div>
@@ -61,6 +61,7 @@ export default {
       confirmTxt: '确定',
       cancleTxt: '',
       _promise: null,
+      isClick:false,
       model: {
         diagnoseChannel: 1,
         appointBeginTime: "",
@@ -125,7 +126,9 @@ export default {
               appointBeginTime: this.rangeTime[0],
               appointEndTime: this.rangeTime[1]
             }
+          vm.isClick = true;
           updateDiagnosis(req).then(function (res) {
+            vm.isClick = false;
             if (res.code == "000000") {
               vm.cancel();
               vm.$emit('search');
@@ -133,6 +136,7 @@ export default {
               vm.$message.error(res.message);
             }
           }).catch(function (error) {
+            vm.isClick = false;
             vm.$message.error(res.message);
           });
       //   }

src/components/common/diagnosis-doctor.vue

@@ -74,7 +74,7 @@
       <!--            </el-row>-->
       <span slot="footer" class="dialog-footer" style="text-align: center;">
                 <el-button @click="cancel">取 消</el-button>
-                <el-button type="primary" @click="confirm">确定</el-button>
+                <el-button type="primary" @click="confirm" :disabled="isClick">确定</el-button>
             </span>
     </el-dialog>
   </div>
@@ -109,6 +109,7 @@ export default {
       confirmTxt: '确定',
       cancleTxt: '',
       _promise: null,
+      isClick: false,
       formData:{
         receptionId:this.doctorId,
         receptionName:"",
@@ -203,7 +204,9 @@ export default {
               receptionEndTime:this.rangeTime[1],
             }
           }
+          vm.isClick = true
           updateDiagnosis(req).then(function (res) {
+            vm.isClick = false
             if(res.code == "000000") {
               vm.cancel();
               vm.$emit('search');
@@ -211,12 +214,14 @@ export default {
               vm.$message.error(res.message);
             }
           }).catch(function (error) {
+            vm.isClick = false
             vm.$message.error(res.message);
           });
         }
       })
     },
     cancel(){
+      this.formData.outsideDoctor = '';
       this.$emit('update:diagnosisDoctorVisible', false);
     },
     doctorChanged(value) {

src/components/common/diagnosis-time.vue

@@ -38,7 +38,7 @@
       <!--            </el-row>-->
       <span slot="footer" class="dialog-footer" style="text-align: center;">
                 <el-button @click="cancel">取 消</el-button>
-                <el-button type="primary" @click="confirm">确定</el-button>
+                <el-button type="primary" @click="confirm" :disabled-="isClick">确定</el-button>
             </span>
     </el-dialog>
   </div>
@@ -76,6 +76,7 @@ export default {
       confirmTxt: '确定',
       cancleTxt: '',
       _promise: null,
+      isClick: false,
       model: {
         assistantRemark: ""
       },
@@ -116,6 +117,7 @@ export default {
             vm.$message.warning("请选择助诊意向时间");
             return;
           }
+          vm.isClick = true
           let req = {
             id:this.diagnoseLogId,
             bizType:this.bizType,
@@ -124,6 +126,7 @@ export default {
             assistantRemark:this.model.assistantRemark
           }
           updateDiagnosis(req).then(function (res) {
+            vm.isClick = false;
             if(res.code == "000000") {
               vm.cancel();
               vm.$emit('search');
@@ -131,6 +134,7 @@ export default {
               vm.$message.error(res.message);
             }
           }).catch(function (error) {
+            vm.isClick = false;
             vm.$message.error(res.message);
           });
       //   }

src/components/common/refund.vue

@@ -26,7 +26,7 @@
       <!--            </el-row>-->
       <span slot="footer" class="dialog-footer" style="text-align: center;">
                 <el-button @click="cancel">取 消</el-button>
-                <el-button type="primary" @click="confirm">确定</el-button>
+                <el-button type="primary" @click="confirm" :disabled="isClick">确定</el-button>
             </span>
     </el-dialog>
   </div>
@@ -53,6 +53,7 @@ export default {
       confirmTxt: '确定',
       cancleTxt: '',
       _promise: null,
+      isClick: false,
       model:{
         refundReason:""
       },
@@ -75,7 +76,9 @@ export default {
             bizType: 2,
             refundReason: this.model.refundReason
           }
+          vm.isClick = true
           updateDiagnosis(req).then(function (res) {
+            vm.isClick = false
             if (res.code == "000000") {
               vm.cancel();
               vm.$emit('search');
@@ -83,6 +86,7 @@ export default {
               vm.$message.error(res.message);
             }
           }).catch(function (error) {
+            vm.isClick = false
             vm.$message.error(res.message);
           });
         }