Merge branch 'feature/jq' into 'release'

Feature/jq

See merge request !131

config/index.js

@@ -38,4 +38,4 @@ module.exports = {
         proxypath: 'http://localhost:9000',
         cssSourceMap: true
     }
-}
+}
\ No newline at end of file

src/components/common/diagnosis-doctor.vue

@@ -19,7 +19,7 @@
           <!--                    <el-input v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" disabled></el-input>-->
           <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-option v-for="item of doctorList" :key="item.doctorId" :label="item.doctorReceptionName" :value="item.doctorId"></el-option>
           </el-select>
           </el-col>
         </el-form-item>
@@ -78,6 +78,7 @@
       </el-form>
       <!--            </el-row>-->
       <span slot="footer" class="dialog-footer" style="text-align: center;">
+                <el-button type="primary" @click="refreshData">刷新数据</el-button>
                 <el-button @click="cancel">取 消</el-button>
                 <el-button type="primary" @click="confirm" :disabled="isClick">确定</el-button>
             </span>
@@ -182,7 +183,11 @@ export default {
         diagnoseChannel:1,
       },
       doctorList:[],
+      sessionDoctorList:[],
+      inNewTime:'',
+      inNewTimeObj:{},
       rangeTime:'',
+      listKey:'',
       addRules:{
         receptionId: [
           {required: true, message: "请选择接诊医生", trigger: 'change'}
@@ -288,6 +293,11 @@ export default {
         }
       })
     },
+    refreshData(){
+      let key= "sessionDoctorList" + this.diagnoseType;
+      localStorage.removeItem(key);
+      this.getDoctorList();
+    },
     cancel(){
       this.doctorId = "";
       this.formData.outsideDoctor = '';
@@ -320,20 +330,27 @@ export default {
     },
     getDoctorList() {
       this.loading = true
-      let url = `/diagnose/doctorService/doctorList?diagnoseType=${this.diagnoseType}`
-      this.GET(url).then(res => {
-        this.loading = false
-        if (res.code == '000000') {
-          this.doctorList = res.data
-          this.doctorChanged(this.formData.receptionId)
-        } else {
+      this.listKey = "sessionDoctorList" + this.diagnoseType;
+      let sessionList = localStorage.getItem(this.listKey);
+      this.sessionDoctorList = JSON.parse(sessionList);
+      if (sessionList){
+        this.doctorList = this.sessionDoctorList
+      }else {
+        let url = `/diagnose/doctorService/doctorList?diagnoseType=${this.diagnoseType}`
+        this.GET(url).then(res => {
+          this.loading = false
+          if (res.code == '000000') {
+            this.doctorList = res.data
+            localStorage.setItem(this.listKey, JSON.stringify(res.data))
+            this.doctorChanged(this.formData.receptionId)
+          } else {
+            this.$message.info('请稍后重试')
+          }
+        }).catch(() => {
+          this.loading = false
           this.$message.info('请稍后重试')
-        }
-
-      }).catch(() => {
-        this.loading = false
-        this.$message.info('请稍后重试')
-      });
+        });
+      }
     },
     openDiagnosisStartTimeDialog (){
       this.diagnosisStartTimeDialog = true;

src/components/common/rematching-doctor.vue

@@ -35,7 +35,7 @@
               placeholder="请输入备注信息"
             ></el-input> -->
 
-              <el-select  style="width: 135%"  size="small" v-model="model.statusRemark" placeholder="请选择备注信息">
+              <el-select  style="width: 135%" allow-create filterable default-first-option size="small" v-model="model.statusRemark" placeholder="请选择备注信息">
                 <el-option
                   v-for="item in rematchingOptions"
                   :key="item"

src/utils/constants.js

@@ -508,7 +508,7 @@ export const TABLE_COLUMN = [
   },
   {
     prop: "receptionBeginTime",
-    label: "接诊诊医生意向时间",
+    label: "接诊医生意向时间",
     showtooltip: false,
   },
   {

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

@@ -751,6 +751,7 @@ export default {
         appointEndTime: "",
         doneTimeBegin: "",
         doneTimeEnd: "",
+        inNewTimeObj:{}
       });
 
     },
@@ -907,7 +908,7 @@ export default {
     //重新匹配医生
     reMatchDot(row, type) {
       if(type==10){
-        this.rematchingOptions=["接诊医生爽约"]
+        this.rematchingOptions=["接诊医生爽约",'上级医生日程改变，提前取消','操作失误，重新匹配医生']
       }
       else{
         this.rematchingOptions=["助诊医生爽约"]