添加备注状态

src/components/common/diagnosis-doctor.vue

@@ -157,6 +157,9 @@ export default {
     this.getDoctorList();
   },
   watch:{
+    diagnoseType:function (){
+      this.getDoctorList();
+    },
     doctorId:function (){
       if(this.doctorId == 0 || this.doctorId == null){
         this.formData.receptionId = "";
@@ -194,6 +197,7 @@ export default {
             }
           }
           else {
+            this.formData.innerFlag = 1;// 内部
             req = {
               id:this.diagnoseLogId,
               bizType:9,
@@ -221,6 +225,7 @@ export default {
       })
     },
     cancel(){
+      this.doctorId = "";
       this.formData.outsideDoctor = '';
       this.$emit('update:diagnosisDoctorVisible', false);
     },

src/components/common/rematching-doctor.vue

 <template>
   <div>
     <el-dialog
-      :title="title"
-      :visible.sync="rematchingVisible" @close="cancel">
+      :title="bizType == 10 ? '重新匹配医生' : '重新联系助诊医生'"
+      :visible.sync="rematchingVisible"
+      @close="cancel"
+    >
       <!--            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
-      <el-form ref="setForm"
-               :rules="addRules"
-               :model="model"
-               label-width="250px"
-               label-suffix=":"
-               label-position="right"
-               size="mini"
-               style="width: 100%;">
-
-        <el-form-item label="备注"  class="required-label"  prop="repatternRemark">
+      <el-form
+        ref="setForm"
+        :rules="addRules"
+        :model="model"
+        label-width="250px"
+        label-suffix=":"
+        label-position="right"
+        size="mini"
+        style="width: 100%"
+      >
+        <el-form-item
+          label="备注"
+          class="required-label"
+          prop="repatternRemark"
+        >
           <el-col :span="15">
-            <el-input type="textarea" v-model="model.repatternRemark" style="width: 135%;" size="small" minlength="2" maxlength="500" placeholder="请输入备注信息"></el-input>
+            <el-input
+              type="textarea"
+              v-model="model.repatternRemark"
+              style="width: 135%"
+              size="small"
+              minlength="2"
+              maxlength="500"
+              placeholder="请输入备注信息"
+            ></el-input>
           </el-col>
         </el-form-item>
-
       </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>
-            </span>
+      <span slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="confirm">确定</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {updateDiagnosis} from "../../utils/diagnosis";
+import { updateDiagnosis } from "../../utils/diagnosis";
 let vm = null;
 export default {
   props: {
     rematchingVisible: {
       type: Boolean,
-      default: false
+      default: false,
+    },
+    bizType: {
+      type: Number,
+      default: 10,
     },
     diagnoseLogId: {
       type: Number,
-      default: 0
+      default: 0,
     },
     bizType: {
       type: Number,
-      default: 0
+      default: 0,
     },
   },
   data() {
     return {
       show: false,
-      title: '重新匹配医生',
-      confirmTxt: '确定',
-      cancleTxt: '',
+      title: "重新匹配医生",
+      confirmTxt: "确定",
+      cancleTxt: "",
       _promise: null,
-      model:{
-        repatternRemark:""
+      model: {
+        repatternRemark: "",
       },
-      addRules:{
+      addRules: {
         repatternRemark: [
-          {required: true, message: "请输入备注信息", trigger: 'blur'}
-        ]
-      }
-    }
+          { required: true, message: "请输入备注信息", trigger: "blur" },
+        ],
+      },
+    };
   },
   created() {
     vm = this;
@@ -72,33 +90,33 @@ export default {
       this.$refs.setForm.validate((valid) => {
         if (valid) {
           let req = {
-            id:this.diagnoseLogId,
-            bizType:10,
-            repatternRemark:this.model.repatternRemark
-          }
-          updateDiagnosis(req).then(function (res) {
-            if(res.code == "000000") {
-              vm.cancel();
-              vm.$emit('search');
-            } else {
+            id: this.diagnoseLogId,
+            bizType: this.bizType,
+            repatternRemark: this.model.repatternRemark,
+          };
+          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);
-            }
-          }).catch(function (error) {
-            vm.$message.error(res.message);
-          });
+            });
         }
-      })
-
+      });
     },
-    cancel(){
+    cancel() {
       this.model.repatternRemark = "";
-      this.$emit('update:rematchingVisible', false);
-    }
-  }
-}
+      this.$emit("update:rematchingVisible", false);
+    },
+  },
+};
 </script>
 
 
 <style lang="scss" scoped>
-
 </style>

src/components/list/table-c.vue

@@ -4,6 +4,7 @@
       v-loading="loading"
       class="search-table"
       :data="tData"
+      @sort-change='sortfunc'
       :height="tableHeight"
       style="width: 100%"
       border
@@ -15,6 +16,7 @@
         :key="item.prop"
         :prop="item.prop"
         :label="item.label"
+        :sortable="item.prop=='appointBeginTime'||item.prop=='assistantBeginTime'?'custom':false"
         :show-overflow-tooltip="item.showtooltip"
         min-width="170"
         align="center"
@@ -142,7 +144,7 @@
             size="small"
             class="btn"
             v-if="showBtn(scope.row, 3, 25, 26)"
-            @click="reMatchDot(scope.row)"
+            @click="reMatchDot(scope.row,10)"
             >重新匹配医生</el-button
           >
           <el-button
@@ -150,7 +152,7 @@
             size="small"
             class="btn"
             v-if="showBtn(scope.row, 3, 25, 26)"
-            @click="reMatchDot(scope.row)"
+            @click="reMatchDot(scope.row,16)"
             >重新联系助诊医生</el-button
           >
           <el-button
@@ -237,6 +239,7 @@ export default {
       default: [],
     },
   },
+
   data() {
     return {
       tableColumn: TABLE_COLUMN,
@@ -244,6 +247,11 @@ export default {
   },
   mounted() {},
   methods: {
+
+
+    sortfunc(data){
+      this.$emit("sortfunc", data);
+    },
     showBtn(row, ...arr) {
       return arr.includes(row.status);
       // return true;
@@ -302,9 +310,9 @@ export default {
       this.$emit("waitMatchTime", row);
     },
     //重新匹配医生
-    reMatchDot(row) {
-      console.log(row)
-      this.$emit("reMatchDot", row);
+    reMatchDot(row,type) {
+
+      this.$emit("reMatchDot", row,type);
     },
     //修改时间
     changeTime(row) {

src/utils/constants.js

@@ -420,6 +420,11 @@ export const TABLE_COLUMN = [
     label: "状态",
     showtooltip: false,
   },
+  {
+    prop: "statusRemark",
+    label: "状态备注",
+    showtooltip: false,
+  },
 
   {
     prop: "toFollowReason",

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

@@ -225,6 +225,7 @@
             :loading="loading"
             :tableHeight="tableHeight"
             :multipleSelection.sync="multipleSelection"
+            @sortfunc="sortfunc"
             @witeDiagnose="witeDiagnose"
             @changeRun="changeRun"
             @goDetail="goDetail"
@@ -316,11 +317,13 @@
 </template>
 <script>
 let vm = null;
-import { updateDiagnosis } from "../../../utils/diagnosis";
-const DOWN_URL = "/diagnose/admin/diagnose/export";
-const LIST_URL = "/diagnose/admin/diagnose/list";
+import {updateDiagnosis} from "../../../utils/diagnosis";
+import { base64decode } from "../../../utils/utils.js";
+const DOWN_URL= '/diagnose/admin/diagnose/export';
+const LIST_URL= '/diagnose/admin/diagnose/list';
 const COUNT_QUERY = "/diagnose/admin/diagnose/countQuery";
-const DEP_URL = "/hospital/departments/0";
+
+const DEP_URL= '/hospital/departments/0'
 import TableComponent from "@/components/list/table-c";
 import {
   TYPE_LIST,
@@ -374,6 +377,7 @@ export default {
         operateName: "",
         assistantVal: "",
         receptionVal: "",
+        sort:null,
         triageDepartmentId: "",
         diagnoseType: "", //预约问诊类型：1、音频 2、视频 3、图文
         createdTimeBegin: "",
@@ -485,7 +489,17 @@ export default {
     },
 
     init() {
-      this.fromType = +(this.$route.query.fromType || 1);
+      let fullPath = this.$route.fullPath;
+      let fromType = 1;
+      if(fullPath.indexOf("?") > -1){
+        let str = base64decode(fullPath.split("?")[1]);
+        if(str.indexOf("?")){
+          fromType = str.split("=")[1];
+        }
+      }
+      // this.fromType = +(this.$route.query.fromType || 1);
+      this.fromType = + fromType;
+
       this.activeName = "99";
       this.searchParam.status = "";
       this.Raw_tabpaneList=[]
@@ -628,6 +642,29 @@ export default {
       this.resetPage();
       this.search();
     },
+    sortfunc(data){
+      // ascending 升序
+      // descending 降序
+      if(data.prop=="appointBeginTime"&&data.order=="ascending"){
+         this.searchParam.sort=1
+
+      }
+      else if(data.prop=="appointBeginTime"&&data.order=="descending"){
+          this.searchParam.sort=2
+      }
+      else if(data.prop=="assistantBeginTime"&&data.order=="ascending"){
+       this.searchParam.sort=3
+      }
+
+      else if(data.prop=="assistantBeginTime"&&data.order=="descending"){
+        this.searchParam.sort=4
+      }
+      else{
+         this.searchParam.sort=null
+      }
+
+      this.search()
+    },
     search() {
       this.loading = true;
       this.initTime();
@@ -672,6 +709,7 @@ export default {
         createdTimeEnd: "",
         operateTimeBegin: "",
         operateTimeEnd: "",
+        sort:null,
         appointBeginTime: "",
         appointEndTime: "",
         doneTimeBegin: "",
@@ -829,11 +867,11 @@ export default {
       }
     },
     //重新匹配医生
-    reMatchDot(row) {
-      console.log(row)
+    reMatchDot(row,type) {
+      console.log(row,type)
       this.rematchingVisible = true;
       this.diagnoseLogId = row.diagnoseLogId;
-      this.bizType = 10;
+      this.bizType = type;
     },
     //修改时间
     changeTime(row) {