Merge branch 'dev-20210702' into 'release'

Dev 20210702,code review:bo.dang

See merge request !21

src/components/common/diagnosis-time.vue

@@ -30,7 +30,7 @@
 
         <el-form-item label="备注">
           <el-col :span="15">
-            <el-input type="textarea" v-model="model.triageRemark" style="width: 135%;" size="small" minlength="2"
+            <el-input type="textarea" v-model="model.assistantRemark" style="width: 135%;" size="small" minlength="2"
                       maxlength="500" placeholder="请输入备注"></el-input>
           </el-col>
         </el-form-item>
@@ -77,7 +77,7 @@ export default {
       cancleTxt: '',
       _promise: null,
       model: {
-        triageRemark: ""
+        assistantRemark: ""
       },
       rangeTime: '',
       addRules: {
@@ -121,7 +121,7 @@ export default {
             bizType:this.bizType,
             assistantBeginTime:this.rangeTime[0],
             assistantEndTime:this.rangeTime[1],
-            triageRemark:this.model.triageRemark
+            assistantRemark:this.model.assistantRemark
           }
           updateDiagnosis(req).then(function (res) {
             if(res.code == "000000") {
@@ -138,7 +138,7 @@ export default {
     },
     cancel() {
       this.rangeTime = "";
-      this.model.triageRemark = "";
+      this.model.assistantRemark = "";
       this.$emit('update:diagnosisTimeVisible', false);
     }
   }

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -564,15 +564,15 @@ export default {
     waitMatchDot(row) {
       this.diagnoseLogId = row.diagnoseLogId;
       // 待分诊
-      if(row.status == 22){
-        this.doctorVisible = true;
-        this.bizType = 7;
-        this.triageDepartmentId = row.triageDepartmentId;
-      }
-      else {
+      // if(row.status == 22){
+      //   this.doctorVisible = true;
+      //   this.bizType = 7;
+      //   this.triageDepartmentId = row.triageDepartmentId;
+      // }
+      // else {
         this.diagnosisTimeVisible = true;
-        this.bizType = 6;
-      }
+        this.bizType = 5;
+      // }
     },
     //发送消息
     sendMessage(row) {
@@ -617,7 +617,7 @@ export default {
     waitDiagnose(row) {
       this.diagnosisTimeVisible = true;
       this.diagnoseLogId = row.diagnoseLogId;
-      this.bizType = 6;
+      this.bizType = 5;
     },
     //设为待协调医生
     waitHzeDot(row) {