Merge branch 'feature/jq119' into 'release'

Feature/jq119

See merge request !261

.env.testing

 NODE_ENV=production
 
 # 自定义 VUE_APP_ENV
-VUE_APP_ENV ='test'
+VUE_APP_ENV ='testing'
 
 VUE_APP_SERVICE_URL=https://test1-sc.yunqueyi.com
 # 阿里云OSS对象存储地址

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

@@ -14,6 +14,11 @@ export const DIAGNOS_LIST_NEW = [
     label: '订单金额',
     showtooltip: false,
   },
+  {
+    prop: 'consultRoad',
+    label: '订单业务类型',
+    showtooltip: false,
+  },
   {
     prop: 'diagnoseTypeStr',
     label: '预约类型',

src/utils/env-config.js

@@ -15,7 +15,8 @@ export const envConfig = {
     qiniuImgUrl: 'https://test1-file.yunqueyi.com',
     loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
     // innerLoginUrl: 'http://localhost:8090/PICA_SSO_FE/html/pica_index.html',
-    innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
+    innerLoginUrl:
+      'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
     yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html',
     phomeDemain: 'https://dev-phome.yunqueyi.com',
     picakfAccId: 'picaop_dev',
@@ -27,18 +28,20 @@ export const envConfig = {
     qiniuResourceUrl: 'https://test1-videos.yunqueyi.com',
     qiniuImgUrl: 'https://test1-file.yunqueyi.com',
     loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
-    innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
+    innerLoginUrl:
+      'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
     yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html',
     phomeDemain: 'https://dev-phome.yunqueyi.com',
     picakfAccId: 'picaop_dev',
   },
-  test: {
+  testing: {
     baseUrl: 'https://test1-sc.yunqueyi.com',
     qiniuFileUrl: 'https://test1-sc.yunqueyi.com/contents/admin/qiniu/token1',
     qiniuResourceUrl: 'https://test1-videos.yunqueyi.com',
     qiniuImgUrl: 'https://test1-file.yunqueyi.com',
     loginUrl: 'https://test1.yunqueyi.com/pica-login/work_station.html',
-    innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
+    innerLoginUrl:
+      'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
     yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html',
     phomeDemain: 'https://test1-phome.yunqueyi.com',
     picakfAccId: 'picaop_test',
@@ -51,7 +54,8 @@ export const envConfig = {
     qiniuImgUrl: 'https://test1-file.yunqueyi.com',
     qiniuResourceUrl: 'https://test1-videos.yunqueyi.com',
     loginUrl: 'https://uat.yunqueyi.com/pica-login/work_station.html',
-    innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
+    innerLoginUrl:
+      'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
     yuequeyiIndexUrl: 'https://uat.yunqueyi.com/pica_index.html',
     phomeDemain: 'https://uat-phome.yunqueyi.com',
     picakfAccId: 'picaop_uat',
@@ -66,5 +70,5 @@ export const envConfig = {
     yuequeyiIndexUrl: 'https://www.yunqueyi.com/pica_index.html',
     phomeDemain: 'https://phome.yunqueyi.com',
     picakfAccId: 'picaop',
-  }
+  },
 };

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

@@ -330,6 +330,26 @@
                   />
                 </el-form-item>
               </div>
+              <div>
+                <el-form-item
+                  label="订单业务类型"
+                  class="t-b"
+                >
+                  <el-select
+                    v-model="searchParam.consultRoad"
+                    placeholder="请选择订单业务类型"
+                    clearable
+                    style="width: 220px"
+                  >
+                    <el-option
+                      v-for="item of orderBusinessList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </div>
             </div>
             <div class="form-btn">
               <div class="form-btn-li">
@@ -636,6 +656,7 @@
           price: '',
           refundRemark: '',
           matchingWay: null,
+          consultRoad: null,
         },
         noteList: [],
         alltabslist: [],
@@ -644,6 +665,16 @@
         sourceList: SOURCE_LIST,
         priceList: ORDER_PRICE,
         matchingWayList: MATCHING_LIST,
+        orderBusinessList: [
+          {
+            label: '中医实践',
+            value: 1,
+          },
+          {
+            label: '向上问诊',
+            value: 0,
+          },
+        ],
         tabpaneList: [],
         rematchingOptions: [], // 备注信息
         Raw_tabpaneList: [],
@@ -1105,6 +1136,7 @@
           assistantBeginTime: '',
           assistantEndTime: '',
           inNewTimeObj: {},
+          consultRoad: null,
         });
       },
       // 导出

src/views/layout/components/slidebar.vue

@@ -133,7 +133,7 @@
         case 'development':
           url = 'https://dev-sockets.yunqueyi.com';
           break;
-        case 'test':
+        case 'testing':
           url = 'https://test1-sockets.yunqueyi.com';
           break;
         case 'uat':
@@ -181,8 +181,6 @@
       color: #fff;
       background: #06232c;
     }
-
   }
 }
 </style>
-