设置预约时间

src/components/common/diagnosis-time.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       :title="title"
-      :visible.sync="appointmentTimeVisible">
+      :visible.sync="diagnosisTimeVisible">
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
       <el-form ref="setForm"
                :rules="addRules"
@@ -13,7 +13,7 @@
                size="mini"
                style="width: 100%;">
 
-        <el-form-item label="助诊意向时间">
+        <el-form-item label="助诊意向时间" class="required-label">
           <el-date-picker
             v-model="rangeTime"
             type="daterange"
@@ -27,7 +27,8 @@
 
         <el-form-item label="备注" class="required-label">
           <el-col :span="15">
-            <el-input type="textarea" v-model="model.assistantRemark" style="width: 90%;" size="small" minlength="2" maxlength="500" placeholder="请输入备注"></el-input>
+            <el-input type="textarea" v-model="model.assistantRemark" style="width: 90%;" size="small" minlength="2"
+                      maxlength="500" placeholder="请输入备注"></el-input>
           </el-col>
         </el-form-item>
       </el-form>
@@ -41,10 +42,19 @@
 </template>
 
 <script>
+import {updateDiagnosis} from "../../utils/diagnosis";
+let vm = null;
 export default {
-  props:[
-    'appointmentTimeVisible'
-  ],
+  props: {
+    diagnosisTimeVisible: {
+      type: Boolean,
+      default: false
+    },
+    diagnoseLogId: {
+      type: Number,
+      default: 0
+    }
+  },
   data() {
     return {
       show: false,
@@ -52,13 +62,13 @@ export default {
       confirmTxt: '确定',
       cancleTxt: '',
       _promise: null,
-      model:{
-        assistantRemark:""
+      model: {
+        assistantRemark: ""
       },
-      rangeTime:'',
-      addRules:{
-        userName: [
-          {required: true, message: "请输入稍后跟进原因", trigger: 'blur'}
+      rangeTime: '',
+      addRules: {
+        rangeTime: [
+          {required: true, message: "请选择助诊意向时间", trigger: 'blur'}
         ]
       },
       pickerOptions1: {
@@ -70,18 +80,20 @@ export default {
       },
     }
   },
-  created() {},
+  created() {
+    vm = this;
+  },
   methods: {
     reset() {
-      this.title =  ''
+      this.title = ''
       this.confirmTxt = '确定'
       this.cancleTxt = ''
       this._promise = null
     },
-    init(obj={}) {
-      Object.assign(this,obj)
+    init(obj = {}) {
+      Object.assign(this, obj)
       this.show = true
-      return new Promise((resolve,reject) => {
+      return new Promise((resolve, reject) => {
         this._promise = {
           resolve,
           reject
@@ -93,17 +105,35 @@ export default {
       await this._promise.reject && this._promise.reject()
       this.reset()
     },
-    async confirm() {
-      this.show = false
-      await this._promise.resolve && this._promise.resolve()
-      this.reset()
+    confirm() {
+      this.$refs.setForm.validate((valid) => {
+        if (valid) {
+          let req = {
+            id:this.diagnoseLogId,
+            bizType:5,
+            assistantBeginTime:this.rangeTime[0],
+            assistantEndTime:this.rangeTime[1],
+            assistantRemark:this.model.assistantRemark
+          }
+          updateDiagnosis(req).then(function (res) {
+            if(res.code == "000000") {
+              vm.cancel();
+              vm.$emit('search');
+            } else {
+              vm.$message.error(res.message);
+            }
+          }).catch(function (error) {
+            vm.$message.error(res.message);
+          });
+        }
+      })
     },
     hide() {
       this.show = false
       this.reset()
     },
-    cancel(){
-      this.$emit('update:appointmentTimeVisible', false);
+    cancel() {
+      this.$emit('update:diagnosisTimeVisible', false);
     }
   }
 }

src/components/common/followup.vue

@@ -21,7 +21,6 @@
 
 
       </el-form>
-      <!--            </el-row>-->
       <span slot="footer" class="dialog-footer" style="text-align: center;">
                 <el-button @click="cancel">取 消</el-button>
                 <el-button type="primary" @click="confirm">确定</el-button>
@@ -31,10 +30,19 @@
 </template>
 
 <script>
+import {updateDiagnosis} from "../../utils/diagnosis";
+let vm = null;
 export default {
-  props:[
-    'followupVisible'
-  ],
+  props: {
+  followupVisible: {
+    type: Boolean,
+    default: false
+  },
+  diagnoseLogId: {
+    type: Number,
+    default: 0
+  }
+},
   data() {
     return {
       show: false,
@@ -52,7 +60,9 @@ export default {
       }
     }
   },
-  created() {},
+  created() {
+    vm = this;
+  },
   methods: {
     reset() {
       this.title =  ''
@@ -75,14 +85,27 @@ export default {
       await this._promise.reject && this._promise.reject()
       this.reset()
     },
-    async confirm() {
-      this.show = false
-      await this._promise.resolve && this._promise.resolve()
-      this.reset()
-    },
-    hide() {
-      this.show = false
-      this.reset()
+    confirm() {
+      this.$refs.setForm.validate((valid) => {
+        if (valid) {
+          let req = {
+            id:this.diagnoseLogId,
+            bizType:4,
+            toFollowReason:this.model.toFollowReason
+          }
+          updateDiagnosis(req).then(function (res) {
+            if(res.code == "000000") {
+              vm.cancel();
+              vm.$emit('search');
+            } else {
+              vm.$message.error(res.message);
+            }
+          }).catch(function (error) {
+            vm.$message.error(res.message);
+          });
+        }
+      })
+
     },
     cancel(){
       this.$emit('update:followupVisible', false);

src/components/common/matching-doctor.vue

@@ -15,24 +15,25 @@
 
         <el-form-item label="分诊科室">
           <el-select
-            v-model="model.commissionType"
-            id="statusSelector"
+            v-model="model.triageDepartmentId"
             placeholder="请选择分诊科室"
             clearable
+            filterable
             style="width:56%;height: 32px;line-height: 32px;"
           >
             <el-option
-              v-for="item in commissionTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in depList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
             ></el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="备注" class="required-label" prop="userName">
+        <el-form-item label="备注" class="required-label">
           <el-col :span="15">
-            <el-input type="textarea" v-model="model.userName" style="width: 90%;" size="small" minlength="2" maxlength="500" placeholder="请输入备注"></el-input>
+            <el-input type="textarea" v-model="model.assistantRemark" style="width: 90%;" size="small" minlength="2"
+                      maxlength="500" placeholder="请输入备注"></el-input>
           </el-col>
         </el-form-item>
 
@@ -47,10 +48,19 @@
 </template>
 
 <script>
+import {updateDiagnosis, getDepList} from "../../utils/diagnosis";
+let vm = null;
 export default {
-  props:[
-    'doctorVisible'
-  ],
+  props: {
+    doctorVisible: {
+      type: Boolean,
+      default: false
+    },
+    diagnoseLogId: {
+      type: Number,
+      default: 0
+    }
+  },
   data() {
     return {
       show: false,
@@ -58,30 +68,42 @@ export default {
       confirmTxt: '确定',
       cancleTxt: '',
       _promise: null,
-      model:{
-        userName:"",
-        title:""
+      depList: [],
+      model: {
+        assistantRemark: "",
+        triageDepartmentId: "",
+        triageDepartment:""
       },
-      commissionTypeList:[],
-      addRules:{
-        userName: [
-          {required: true, message: "请输入稍后跟进原因", trigger: 'blur'}
-        ]
-      }
+      commissionTypeList: [],
+      addRules: {}
     }
   },
-  created() {},
+  created() {
+    vm = this;
+    this.getDepList();
+  },
   methods: {
+    getDepList() {
+      getDepList().then(function (res) {
+        if (res.code == "000000") {
+          vm.depList = res.data;
+        } else {
+          vm.$message.error(res.message);
+        }
+      }).catch(function (error) {
+        vm.$message.error(res.message);
+      });
+    },
     reset() {
-      this.title =  ''
+      this.title = ''
       this.confirmTxt = '确定'
       this.cancleTxt = ''
       this._promise = null
     },
-    init(obj={}) {
-      Object.assign(this,obj)
+    init(obj = {}) {
+      Object.assign(this, obj)
       this.show = true
-      return new Promise((resolve,reject) => {
+      return new Promise((resolve, reject) => {
         this._promise = {
           resolve,
           reject
@@ -93,16 +115,29 @@ export default {
       await this._promise.reject && this._promise.reject()
       this.reset()
     },
-    async confirm() {
-      this.show = false
-      await this._promise.resolve && this._promise.resolve()
-      this.reset()
-    },
-    hide() {
-      this.show = false
-      this.reset()
+    confirm() {
+      this.$refs.setForm.validate((valid) => {
+        if (valid) {
+          let req = {
+            id: this.diagnoseLogId,
+            bizType: 5,
+            assistantRemark: this.model.assistantRemark
+          }
+          updateDiagnosis(req).then(function (res) {
+            if (res.code == "000000") {
+              vm.cancel();
+              vm.$emit('search');
+            } else {
+              vm.$message.error(res.message);
+            }
+          }).catch(function (error) {
+            vm.$message.error(res.message);
+          });
+        }
+      })
     },
-    cancel(){
+
+    cancel() {
       this.$emit('update:doctorVisible', false);
     }
   }

src/components/common/refund.vue

@@ -34,7 +34,7 @@
 
 <script>
 import { updateDiagnosis } from '../../utils/diagnosis';
-
+let vm = null;
 export default {
   props: {
   refundVisible:{
@@ -63,7 +63,9 @@ export default {
       }
     }
   },
-  created() {},
+  created() {
+    vm = this;
+  },
   methods: {
     confirm() {
       let req = {
@@ -71,23 +73,15 @@ export default {
         bizType:2,
         refundReason:this.model.refundReason
       }
-      // this.loading = true;
-      // let url = `/diagnose/admin/diagnose/model/save`;
-      // this.POST(url, req).then((res) => {
-      //   this.loading = false;
-      //   if (res.code == "000000") {
-      //     // this.tableData = res.data.list;
-      //     // this.totalRows = res.data.allSize;
-      //   }
-      // });
-
       updateDiagnosis(req).then(function (res) {
         if(res.code == "000000") {
-
-          // vm.formData = res.data;
+          vm.cancel();
+          vm.$emit('search');
+        } else {
+          vm.$message.error(res.message);
         }
       }).catch(function (error) {
-        // vm.$message.error(error);
+        vm.$message.error(res.message);
       });
     },
     cancel(){

src/utils/diagnosis/index.js

@@ -27,3 +27,13 @@ export const batchSetOperator = (params) => {
   })
 };
 
+
+/*科室*/
+export const getDepList = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`/hospital/departments/0`),
+    method: 'get',
+    description: '获得科室',
+  })
+};

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

@@ -222,13 +222,14 @@
         </el-tab-pane>
       </el-tabs>
       <match-component @search="search" :matchVisible.sync="matchVisible" :diagnoseLogId="diagnoseLogId" :batchFlag="batchFlag" :multipleSelection="multipleSelection"></match-component>
-      <refund-component :refundVisible.sync="refundVisible" :diagnoseLogId="diagnoseLogId"></refund-component>
-      <followup-component :followupVisible.sync="followupVisible"></followup-component>
-      <matching-doctor :doctorVisible.sync="doctorVisible"></matching-doctor>
+      <refund-component @search="search" :refundVisible.sync="refundVisible" :diagnoseLogId="diagnoseLogId"></refund-component>
+      <followup-component @search="search" :followupVisible.sync="followupVisible" :diagnoseLogId="diagnoseLogId"></followup-component>
+      <matching-doctor @search="search" :doctorVisible.sync="doctorVisible" :diagnoseLogId="diagnoseLogId"></matching-doctor>
       <diagnosis-component :diagnosisVisible.sync="diagnosisVisible"></diagnosis-component>
       <coordinating-doctor :coordinatingVisible.sync="coordinatingVisible"></coordinating-doctor>
       <diagnosis-doctor :diagnosisDoctorVisible.sync="diagnosisDoctorVisible"></diagnosis-doctor>
       <appointment-time :appointmentTimeVisible.sync="appointmentTimeVisible"></appointment-time>
+      <diagnosis-time :diagnosisTimeVisible.sync="diagnosisTimeVisible" :diagnoseLogId="diagnoseLogId"></diagnosis-time>
     </div>
   </div>
 </template>
@@ -254,6 +255,7 @@ import DiagnosisComponent from "../../../components/common/diagnosis"
 import CoordinatingDoctor from "../../../components/common/coordinating-doctor"
 import DiagnosisDoctor from "../../../components/common/diagnosis-doctor"
 import AppointmentTime from "../../../components/common/appointment-time"
+import DiagnosisTime from "../../../components/common/diagnosis-time"
 export default {
   components: {
     TableComponent,
@@ -264,7 +266,8 @@ export default {
     DiagnosisComponent,
     CoordinatingDoctor,
     DiagnosisDoctor,
-    AppointmentTime
+    AppointmentTime,
+    DiagnosisTime
   },
   data() {
     return {
@@ -314,6 +317,7 @@ export default {
       coordinatingVisible:false,
       diagnosisDoctorVisible:false,
       appointmentTimeVisible:false,
+      diagnosisTimeVisible:false,
       multipleSelection:[],
       batchFlag:false,
       pickerOptions1: {
@@ -471,9 +475,15 @@ export default {
       this.diagnoseLogId = row.diagnoseLogId;
     },
     //设为稍后跟进
-    witeGo(row) {},
+    witeGo(row) {
+      this.followupVisible = true;
+      this.diagnoseLogId = row.diagnoseLogId;
+    },
     //设为待匹配医生
-    waitMatchDot(row) {},
+    waitMatchDot(row) {
+      this.diagnosisTimeVisible = true;
+      this.diagnoseLogId = row.diagnoseLogId;
+    },
     //发送消息
     sendMessage(row) {},
     //加入问诊