Merge branch 'release' into 'master'

Release

See merge request !259

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

@@ -119,7 +119,7 @@ export const STATUS_LIST = [
     value: 6,
   },
   {
-    label: '已匹配',
+    label: '待联系',
     value: 21,
   },
   {
@@ -289,21 +289,21 @@ export const ALL_TAB_LIST = [
     active: '99',
   },
   {
-    label: '待匹配',
+    label: '待分诊',
     active: '2',
   },
   {
-    label: '已匹配',
+    label: '待联系',
     active: '102',
   },
   {
     label: '稍后跟进',
     active: '101',
   },
-  {
-    label: '待分诊',
-    active: '22',
-  },
+  // {
+  //   label: '待分诊',
+  //   active: '22',
+  // },
   {
     label: '待匹配医生',
     active: '23',
@@ -389,7 +389,7 @@ export const TRIAGE_TAB_LIST = [
   //   active: '22'
   // },
   {
-    label: '待匹配',
+    label: '待分诊',
     active: '2',
   },
 ];
@@ -421,7 +421,7 @@ export const MATCH_TAB_LIST = [
     active: '99',
   },
   {
-    label: '已匹配',
+    label: '待联系',
     active: '102',
   },
   {

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,24 @@
         departmentId: '',
         allTilst: [],
         allList: {},
+        consultationTypeList: [
+          {
+            label: '全部',
+            value: '',
+          },
+          {
+            label: '名医问诊',
+            value: 2,
+          },
+          {
+            label: '极速问诊',
+            value: 1,
+          },
+          {
+            label: '-',
+            value: 0,
+          },
+        ],
       };
     },
     watch: {
@@ -1045,6 +1084,7 @@
         this.assistantTime = '';
         this.searchParam = Object.assign(this.searchParam, {
           id: '',
+          type: '',
           operateName: '',
           assistantVal: '',
           receptionVal: '',