待匹配状态：隐藏匹配运营按钮

已匹配状态：隐藏设为待分诊按钮，取消隐藏设为待匹配医生按钮

src/components/common/appointment-time.vue

@@ -15,8 +15,8 @@
 
 
         <el-form-item v-if="bizType == 12" label="问诊方式" prop="diagnoseChannel">
-          <el-col :span="16">
-            <el-radio-group v-model="model.diagnoseChannel" size="small" style="line-height: 45px;">
+          <el-col :span="15">
+            <el-radio-group v-model="model.diagnoseChannel" size="small" style="line-height: 45px;width: 135%;">
               <el-radio :label="1">APP问诊（系统发起问诊）</el-radio>
               <el-radio :label="2">线下问诊（APP不会自动发起问诊）</el-radio>
             </el-radio-group>
@@ -24,6 +24,7 @@
         </el-form-item>
 
         <el-form-item label="预约时间" class="required-label" prop="rangeTime">
+          <el-col :span="15">
           <el-date-picker
             v-model="rangeTime"
             type="datetimerange"
@@ -32,8 +33,10 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            :picker-options="pickerOptions1">
+            :picker-options="pickerOptions1"
+            style="width: 135%;">
           </el-date-picker>
+          </el-col>
         </el-form-item>
 
       </el-form>

src/components/common/diagnosis-doctor.vue

@@ -15,35 +15,48 @@
 
         <el-form-item label="接诊医生" class="required-label" prop="receptionId">
           <!--                    <el-input v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" disabled></el-input>-->
-          <el-select @change="doctorChanged($event)" filterable v-model="formData.receptionId" placeholder="请选择接诊医生" class="set-width">
+          <el-col :span="15">
+          <el-select @change="doctorChanged($event)" filterable v-model="formData.receptionId" placeholder="请选择接诊医生" class="set-width" style="width: 100%;">
             <el-option v-for="item of doctorList" :key="item.doctorId" :label="item.doctorName" :value="item.doctorId"></el-option>
           </el-select>
+          </el-col>
         </el-form-item>
         <el-form-item label="接诊医生职称" >
-          <el-input v-model="formData.doctorTitle" placeholder="请选择职称" class="set-width" disabled></el-input>
+          <el-col :span="15">
+          <el-input v-model="formData.doctorTitle" placeholder="请选择职称" class="set-width" disabled style="width: 100%;"></el-input>
           <!-- <el-select v-model="formData.doctorTitle" placeholder="请选择职称" disabled class="set-width">
               <el-option v-for="item of sexList" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select> -->
+          </el-col>
         </el-form-item>
         <el-form-item label="接诊医生所在机构" >
-          <el-input v-model="formData.doctorHospital" placeholder="请选择机构" class="set-width" disabled></el-input>
-          <!-- <el-select v-model="formData.doctorHospital" placeholder="请选择机构" disabled class="set-width">
+          <el-col :span="15">
+          <el-input v-model="formData.doctorHospital" placeholder="请选择机构" class="set-width" disabled style="width: 100%;"></el-input>
+          </el-col>
+            <!-- <el-select v-model="formData.doctorHospital" placeholder="请选择机构" disabled class="set-width">
               <el-option v-for="item of sexList" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select> -->
         </el-form-item>
         <el-form-item label="接诊医生所在科室" >
-          <el-input v-model="formData.doctorDepartment" placeholder="请选择机构" class="set-width" disabled></el-input>
+          <el-col :span="15">
+          <el-input v-model="formData.doctorDepartment" placeholder="请选择机构" class="set-width" disabled style="width: 100%;"></el-input>
           <!-- <el-select v-model="formData.doctorDepartment" placeholder="请选择科室" disabled class="set-width">
               <el-option v-for="item of sexList" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select> -->
+          </el-col>
         </el-form-item>
         <el-form-item label="接诊医生电话">
-          <el-input v-model="formData.doctorMobile" placeholder="请输入接诊医生手机号" disabled class="set-width"></el-input>
+          <el-col :span="15">
+          <el-input v-model="formData.doctorMobile" placeholder="请输入接诊医生手机号" disabled class="set-width" style="width: 100%;"></el-input>
+          </el-col>
         </el-form-item>
         <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-col :span="15">
+          <el-input v-model="formData.outsideDoctor" placeholder="请输入外部医生姓名" class="set-width" style="width: 135%;"></el-input>
+          </el-col>
         </el-form-item>
         <el-form-item label="接诊意向时间">
+          <el-col :span="15">
           <el-date-picker
             v-model="rangeTime"
             type="datetimerange"
@@ -51,8 +64,10 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            :picker-options="pickerOptions1">
+            :picker-options="pickerOptions1"
+            style="width: 100%;">
           </el-date-picker>
+          </el-col>
         </el-form-item>
 
       </el-form>

src/components/common/diagnosis-time.vue

@@ -14,6 +14,7 @@
                style="width: 100%;">
 
         <el-form-item label="助诊意向时间" class="required-label" prop="rangeTime">
+          <el-col :span="15">
           <el-date-picker
             v-model="rangeTime"
             type="datetimerange"
@@ -21,13 +22,15 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            :picker-options="pickerOptions1">
+            :picker-options="pickerOptions1"
+             style="width: 135%;">
           </el-date-picker>
+          </el-col>
         </el-form-item>
 
         <el-form-item label="备注">
           <el-col :span="15">
-            <el-input type="textarea" v-model="model.triageRemark" style="width: 90%;" size="small" minlength="2"
+            <el-input type="textarea" v-model="model.triageRemark" style="width: 135%;" size="small" minlength="2"
                       maxlength="500" placeholder="请输入备注"></el-input>
           </el-col>
         </el-form-item>
@@ -69,7 +72,7 @@ export default {
     }
     return {
       show: false,
-      title: '设置预约时间（问诊时间）',
+      title: '设置时间',
       confirmTxt: '确定',
       cancleTxt: '',
       _promise: null,

src/components/list/table-c.vue

@@ -50,12 +50,12 @@
           <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) && menuType ==1 " @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,22)" @click="waitMatchDot(scope.row)">设为待匹配医生</el-button>
+          <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,22,21)" @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,26)" @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,2)" @click="matchRun(scope.row)">匹配运营</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,5,6)" @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,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>
           <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,25,26)" @click="reMatchDot(scope.row)">重新匹配医生</el-button>
@@ -173,13 +173,13 @@ export default {
       this.$emit("joinDiagnose", row);
     },
     //匹配运营
-    matchRun(row) {
-      this.$emit("matchRun", row);
-    },
+    // matchRun(row) {
+    //   this.$emit("matchRun", row);
+    // },
     //设为待分诊
-    waitDiagnose(row) {
-      this.$emit("waitDiagnose", row);
-    },
+    // waitDiagnose(row) {
+    //   this.$emit("waitDiagnose", row);
+    // },
     //设为待协调医生
     waitHzeDot(row) {
       this.$emit("waitHzeDot", row);