冲突合并

src/api/diagnosis.js

@@ -317,3 +317,10 @@ export const doctorDeparList = async (data) => {
     method: 'get',
   });
 };
+export const savePCDayCount = async (data) => {
+  return request({
+    url: '/diagnose/doctor/work/savePCDayCount',
+    data: data,
+    method: 'post',
+  });
+};

src/components/list/table-serviceSchedule.vue

@@ -68,6 +68,12 @@
         :filters="createList"
         :filter-method="getLevel"
       />
+      <el-table-column
+        prop="preNum"
+        label="接诊上限/小时"
+        width="150"
+        align="center"
+      />
       <el-table-column
         prop="workStatus"
         label="排班状态"
@@ -121,7 +127,7 @@
         label="操作"
         fixed="right"
         align="center"
-        min-width="200"
+        min-width="270"
       >
         <template slot-scope="scope">
           <div
@@ -148,6 +154,12 @@
             >
               查看
             </div>
+            <div
+              class="download-btn"
+              @click="setMaxNumValue(scope.row)"
+            >
+              接诊上限
+            </div>
           </div>
         </template>
       </el-table-column>
@@ -225,6 +237,7 @@
             text: '未开通',
           },
         ],
+      // maxNumValue: '',
       };
     },
     computed: {},
@@ -254,6 +267,10 @@
       addSchedule(value, val) {
         this.$emit('addSchedule', value, val);
       },
+      // 点击接诊上限按钮弹框打开
+      setMaxNumValue(value) {
+        this.$emit('setMaxNumValue', value);
+      },
       // 分页
       handleSizeChange(value) {
         this.$emit('handleSizeChange', value);

src/utils/GeneralData/diagnosis-list-new.js

@@ -20,6 +20,12 @@ export const DIAGNOS_LIST_NEW = [
     showtooltip: false,
     with: '200',
   },
+  {
+    prop: 'type',
+    label: '问诊类型',
+    showtooltip: false,
+    with: '200',
+  },
   {
     prop: 'refundRemark',
     label: '外呼状态',

src/utils/constants.js

@@ -289,11 +289,11 @@ export const ALL_TAB_LIST = [
     active: '99',
   },
   {
-    label: '待匹配',
+    label: '待分诊',
     active: '2',
   },
   {
-    label: '已匹配',
+    label: '待联系',
     active: '102',
   },
   {
@@ -304,10 +304,10 @@ export const ALL_TAB_LIST = [
     label: '待分诊',
     active: '22',
   },
-  {
-    label: '待匹配医生',
-    active: '23',
-  },
+  // {
+  //   label: '待匹配医生',
+  //   active: '23',
+  // },
   {
     label: '待协调医生',
     active: '24',
@@ -316,10 +316,10 @@ export const ALL_TAB_LIST = [
     label: '待确认时间',
     active: '25',
   },
-  {
-    label: '待问诊',
-    active: '26',
-  },
+  // {
+  //   label: '待问诊',
+  //   active: '26',
+  // },
   {
     label: '问诊中',
     active: '3',

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

@@ -31,6 +31,25 @@
                   />
                 </el-form-item>
               </div>
+              <div>
+                <el-form-item
+                  label="问诊类型"
+                  class="t-b"
+                >
+                  <el-select
+                    v-model="searchParam.type"
+                    placeholder="请选择问诊类型"
+                    style="width: 220px"
+                  >
+                    <el-option
+                      v-for="item of consultationTypeList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </div>
               <div>
                 <el-form-item
                   label="分诊科室"
@@ -57,6 +76,7 @@
                     :options="allTilst"
                     placeholder="选择科室"
                     :show-all-levels="false"
+                    style="width: 220px"
                     @change="changeDepart"
                   >
                     <template slot-scope="{ data }">
@@ -592,6 +612,7 @@
         tabrefresh: true,
         searchParam: {
           id: '',
+          type: '',
           operateName: '',
           assistantVal: '',
           receptionVal: '',
@@ -673,6 +694,20 @@
         departmentId: '',
         allTilst: [],
         allList: {},
+        consultationTypeList: [
+          {
+            label: '名医问诊',
+            value: 2,
+          },
+          {
+            label: '极速问诊',
+            value: 1,
+          },
+          {
+            label: '-',
+            value: 0,
+          },
+        ],
       };
     },
     watch: {
@@ -1045,6 +1080,7 @@
         this.assistantTime = '';
         this.searchParam = Object.assign(this.searchParam, {
           id: '',
+          type: '',
           operateName: '',
           assistantVal: '',
           receptionVal: '',

src/views/IM/diagnosis-admin/serviceSchedule.vue

@@ -138,6 +138,7 @@
             :total-rows="searchParam.totalRows"
             :loading="loading"
             :create-list="newCreateList"
+            :center-dialog-visible="centerDialogVisible"
             @sortfunc="sortfunc"
             @getServiceOpen="getServiceOpen"
             @getWorkStatus="getWorkStatus"
@@ -145,6 +146,7 @@
             @handleSizeChange="handleSizeChange"
             @handleCurrentChange="handleCurrentChange"
             @addSchedule="addSchedule"
+            @setMaxNumValue="setMaxNumValue"
           />
         </div>
       </div>
@@ -155,6 +157,36 @@
       href=""
       target="_blank"
     />
+    <el-dialog
+      :visible.sync="centerDialogVisible"
+      width="30%"
+      center
+      class="el-dialog-show"
+    >
+      <div class="set-agment-maxNum">
+        <div class="num-max">
+          <span class="hour-num-title">每小时接诊上限人数</span>
+          <div class="num-input-show">
+            <el-input-number
+              v-model="maxNumValue"
+              :min="0"
+              :max="20"
+              @change="getMaxNumValue"
+            />
+          </div>
+        </div>
+      </div>
+      <span
+        slot="footer"
+        class="dialog-footer"
+      >
+        <el-button @click="centerDialogVisible = false">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="submitSetData"
+        >确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -165,7 +197,7 @@
     workInStep,
     getLevel,
   } from '@/api/serviceSchedule';
-  import { departmentAll } from '@/api/diagnosis';
+  import { departmentAll, savePCDayCount } from '@/api/diagnosis';
   import TableServiceSchedule from '@/components/list/table-serviceSchedule';
   export default {
     components: {
@@ -227,6 +259,9 @@
         newCreateList: [],
         allTilst: [],
         allList: {},
+        centerDialogVisible: false,
+        doctorInfo: {},
+        maxNumValue: '',
       };
     },
     watch: {},
@@ -403,20 +438,33 @@
         this.search();
       },
       addSchedule(value, val) {
-        // this.ScheduleListShow = false;
-        // this.schedulingType = val;
         const target = this.$refs.target;
         const { origin } = window.location;
         const u = `${origin}/consultation/pica-admin-consultation/addEditSchedule?type=${val}&doctorId=${value.doctorId}&id=${value.id}`;
         target.setAttribute('href', u);
         target.click();
       },
-    // goBack(flag) {
-    //   this.ScheduleListShow = true;
-    //   if (flag) {
-    //     this.search();
-    //   }
-    // },
+      setMaxNumValue(value) {
+        this.doctorInfo = value;
+        this.maxNumValue = value.preNum;
+        this.centerDialogVisible = true;
+      },
+      // 每小时接诊上限人数
+      getMaxNumValue(value) {
+        this.maxNumValue = value;
+      },
+      submitSetData() {
+        const params = {
+          doctorId: this.doctorInfo.doctorId,
+          preNum: this.maxNumValue,
+        };
+        savePCDayCount(params).then((res) => {
+          if (res.code == '000000') {
+            this.centerDialogVisible = false;
+            this.search();
+          }
+        });
+      },
     },
   };
 </script>
@@ -541,6 +589,29 @@
       }
     }
   }
+  .el-dialog-show {
+    .set-agment-maxNum {
+      .num-max {
+        text-align: center;
+        .hour-num-title {
+          font-size: 16px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #02120f;
+        }
+        .num-input-show {
+          padding-top: 10px;
+          .el-input {
+            width: 50%;
+            /deep/.el-input__inner {
+              border-radius: 20px;
+              text-align: center;
+            }
+          }
+        }
+      }
+    }
+  }
 }
 </style>
 <style lang="scss">