Merge branch 'dev-20210702' of...

Merge branch 'dev-20210702' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-consultation into dev-20210702

src/components/common/diagnosis-doctor.vue

@@ -43,7 +43,7 @@
         <el-form-item v-if="formData.receptionName == '站外医生' || formData.receptionName == '云鹊医助'" label="外部医生姓名" class="required-label"  prop="outsideDoctor">
           <el-input v-model="formData.outsideDoctor" placeholder="请输入外部医生姓名" class="set-width"></el-input>
         </el-form-item>
-        <el-form-item label="接诊意向时间" class="required-label"  prop="rangeTime">
+        <el-form-item label="接诊意向时间">
           <el-date-picker
             v-model="rangeTime"
             type="datetimerange"
@@ -83,8 +83,8 @@ export default {
       default: 0
     },
     doctorId: {
-      type: String,
-      default: ""
+      type: Number|String,
+      default: 0
     },
   },
   data() {
@@ -115,20 +115,17 @@ export default {
         outsideDoctor: [
           {required: true, message: "请输入外部医生姓名", trigger: 'blur'}
         ],
-        rangeTime: [
-          // {type: 'array',required: true, validator: checkDate, trigger: 'blur,change'}
-          {
-            type: 'array',
-            required: true,
-            // message: "预约时间不能为空",
-            // validator: checkDate,
-            trigger: 'change',
-            fields: {
-              0: {required: true, type: 'date', message: "开始时间不能为空"},
-              1: {required: true, type: 'date', message: '结束时间不能为空'}
-            }
-          }
-        ]
+        // rangeTime: [
+        //   {
+        //     type: 'array',
+        //     required: true,
+        //     trigger: 'change',
+        //     fields: {
+        //       0: {required: true, type: 'date', message: "开始时间不能为空"},
+        //       1: {required: true, type: 'date', message: '结束时间不能为空'}
+        //     }
+        //   }
+        // ]
       },
       pickerOptions1: {
         disabledDate: time => {
@@ -159,10 +156,10 @@ export default {
       console.log("doctorId:" + this.doctorId);
       this.$refs.setForm.validate((valid) => {
         if (valid) {
-          if(!(this.rangeTime != null && this.rangeTime.length > 0)){
-            vm.$message.warning("请选择接诊意向时间");
-            return;
-          }
+          // if(!(this.rangeTime != null && this.rangeTime.length > 0)){
+          //   vm.$message.warning("请选择接诊意向时间");
+          //   return;
+          // }
           if(this.formData.receptionName == "站外医生" || this.formData.receptionName == "云鹊医助"){
             this.formData.innerFlag = 2;// 外部
           }

src/components/common/match.vue

@@ -66,7 +66,7 @@ export default {
       default: false
     },
     operateUserID: {
-      type: String,
+      type: String|Number,
       default: ""
     },
   },

src/components/list/table-c.vue

@@ -21,8 +21,23 @@
         :label="item.label"
         :show-overflow-tooltip="item.showtooltip"
         min-width="170"
-        align="center"
-      ></el-table-column>
+        align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.column.property == 'appointBeginTime'">
+            <p>{{scope.row.appointBeginTime}}</p>
+            <p>{{scope.row.appointEndTime}}</p>
+          </div>
+          <div v-else-if="scope.column.property == 'assistantBeginTime'">
+            <p>{{scope.row.assistantBeginTime}}</p>
+            <p>{{scope.row.assistantEndTime}}</p>
+          </div>
+          <div v-else-if="scope.column.property == 'receptionBeginTime'">
+            <p>{{scope.row.receptionBeginTime}}</p>
+            <p>{{scope.row.receptionEndTime}}</p>
+          </div>
+          <div v-else><p>{{scope.row[scope.column.property]}}</p></div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         fixed="right"
@@ -35,11 +50,11 @@
           <el-button type="primary" size="small" class="btn"  @click="goDetail(scope.row,false)">查看详情</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,21,22,23,24,25,26,3)" @click="cancelRefund(scope.row)">取消/退款</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="witeGo(scope.row)">设为稍后跟进</el-button>
-          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21,22)" @click="waitMatchDot(scope.row)">设为待匹配医生</el-button>
+          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,22)" @click="waitMatchDot(scope.row)">设为待匹配医生</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,4,5,6,21,22,23,24,25,26)" @click="sendMessage(scope.row)">发送消息</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3)" @click="joinDiagnose(scope.row)">加入问诊</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2)" @click="matchRun(scope.row)">匹配运营</el-button>
-          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,4,6,21,22,23,24,25,26)" @click="goDetail(scope.row,true)" >编辑</el-button>
+          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,3,4,6,21,22,23,24,25,26)" @click="goDetail(scope.row,true)" >编辑</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="waitDiagnose(scope.row)">设为待分诊</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,23)" @click="waitHzeDot(scope.row)">设为待协调医生</el-button>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,23,24)" @click="waitMatchTime(scope.row)">设为待确认时间</el-button>
@@ -196,7 +211,7 @@ export default {
     },
     setOffice(value) {
       this.$emit("setOffice", value);
-    }
+    },
    },
 };
 </script>

src/utils/constants.js

@@ -373,6 +373,10 @@ export const  RECEPTION_TAB_LIST = [
     label: '待协调医生',
     active: '6'
   },
+  {
+    label: '待确认时间',
+    active: '25'
+  },
 ]
 
 // 外呼列表
@@ -409,12 +413,7 @@ export const TABLE_COLUMN = [
   },
   {
     prop: "appointBeginTime",
-    label: "预约开始时间",
-    showtooltip: false,
-  },
-  {
-    prop: "appointEndTime",
-    label: "预约结束时间",
+    label: "预约时间",
     showtooltip: false,
   },
   {
@@ -529,7 +528,7 @@ export const TABLE_COLUMN = [
   },
   {
     prop: "diagnoseAdvice",
-    label: '诊断建议"',
+    label: '诊断建议',
     showtooltip: true,
   },
   {

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

@@ -330,7 +330,7 @@ export default {
       batchFlag:false,
       bizType:0,
       diagnoseType:0,
-      doctorId:"",
+      doctorId:0,
       operateUserID:"",
       pickerOptions1: {
         disabledDate: (time) => {