Merge branch 'dev-20210702' of...

Merge branch 'dev-20210702' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-admin-consultation into dev-20210702

src/components/common/match.vue

@@ -13,41 +13,15 @@
                size="mini"
                style="width: 100%;">
 
-<!--        <el-form-item label="助诊医生" class="required-label" prop="userName">-->
-<!--          <el-col :span="15">-->
-<!--            <el-select v-model="model.userName"-->
-<!--                       filterable-->
-<!--                       remote-->
-<!--                       placeholder="请输入专家姓名或医院名称,多个关键字用空格隔开，至少输入两个字符"-->
-<!--                       clearable-->
-<!--                       style="width: 130%;"-->
-<!--                       :remote-method="remoteMethod"-->
-<!--                       :disabled="isEdit"-->
-<!--                       @change="nameChange"-->
-<!--                       @visible-change="noSelectHand">-->
-<!--              <el-option-->
-<!--                v-for="item in nameList"-->
-<!--                :key="item.id"-->
-<!--                :label="item.name"-->
-<!--                :value="item.id">-->
-<!--                <span>{{item.value}}</span>-->
-<!--              </el-option>-->
-<!--            </el-select>-->
-<!--          </el-col>-->
-<!--        </el-form-item>-->
-
-        <!--                <el-col :span="15" style="margin-left: 105px;">-->
-        <!--                  实际收入（接诊后实际到账金额）: ￥{{tempPrice | rounding}}-->
-        <!--                </el-col>-->
-
         <el-form-item label="运营名称" class="required-label" prop="operatorName">
           <el-col :span="15">
 
             <el-select
-              v-model="model.operatorName"
+              v-model="model.operatorId"
               placeholder="请选择运营名称"
               filterable
               clearable
+              @change="changeOperator"
               style="width:110%;height: 32px;line-height: 32px;"
             >
               <el-option
@@ -73,11 +47,18 @@
 
 <script>
 import { updateDiagnosis } from '../../utils/diagnosis';
-
+let vm = null;
 export default {
-  props:[
-    'matchVisible'
-  ],
+  props: {
+    matchVisible:{
+      type: Boolean,
+      default: false
+    },
+    diagnoseLogId: {
+      type: Number,
+      default: 0
+    }
+  },
   data() {
     return {
       show: false,
@@ -98,39 +79,30 @@ export default {
     }
   },
   created() {
+    vm = this;
     this.getAdminList();
   },
   methods: {
-    reset() {
-      this.title =  ''
-      this.confirmTxt = '确定'
-      this.cancleTxt = ''
-      this._promise = null
-    },
-    init(obj={}) {
-      Object.assign(this,obj)
-      this.show = true
-      return new Promise((resolve,reject) => {
-        this._promise = {
-          resolve,
-          reject
-        };
-      })
-    },
-    async cancle() {
-      this.show = false
-      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() {
+      let req = {
+        id:this.diagnoseLogId,
+        bizType:1,
+        operatorId:this.model.operatorId,
+        operatorName:this.model.operatorName
+      }
+      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(error);
+      });
     },
+
     cancel(){
       this.$emit('update:matchVisible', false);
     },
@@ -146,7 +118,17 @@ export default {
           this.adminList = res.data;
         }
       });
+    },
+    changeOperator(data){
+      for (let i=0;i < this.adminList.length; i++){
+        if(data == this.adminList[i].id){
+          this.model.operatorName = this.adminList[i].name;
+          break;
+        }
+      }
     }
+
+
   }
 }
 </script>

src/components/common/refund.vue

@@ -42,8 +42,8 @@ export default {
     default: false
   },
   diagnoseLogId: {
-    type: String,
-    default: ''
+    type: Number,
+    default: 0
   }
   },
   data() {
@@ -65,27 +65,6 @@ export default {
   },
   created() {},
   methods: {
-    reset() {
-      this.title =  ''
-      this.confirmTxt = '确定'
-      this.cancleTxt = ''
-      this._promise = null
-    },
-    init(obj={}) {
-      Object.assign(this,obj)
-      this.show = true
-      return new Promise((resolve,reject) => {
-        this._promise = {
-          resolve,
-          reject
-        };
-      })
-    },
-    async cancle() {
-      this.show = false
-      await this._promise.reject && this._promise.reject()
-      this.reset()
-    },
     confirm() {
       let req = {
         id:this.diagnoseLogId,
@@ -111,10 +90,6 @@ export default {
         // vm.$message.error(error);
       });
     },
-    hide() {
-      this.show = false
-      this.reset()
-    },
     cancel(){
       this.$emit('update:refundVisible', false);
     },

src/views/IM/diagnosis-admin/diagnosis-editor.vue

@@ -243,9 +243,9 @@
                         <el-option v-for="item of relationList" :key="item.value" :label="item.label" :value="item.value" ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="招募人" v-if="true" prop="userName">
-                    {{'张兰'}}
-                </el-form-item>
+                <!-- <el-form-item label="招募人" v-if="formData.crrsName" prop="crrsName">
+                    {{ formData.crrsName }}
+                </el-form-item> -->
 
                 <br/>
                 <h1>接诊信息</h1>
@@ -494,6 +494,16 @@ export default {
                 operateUserName: '',
                 appointBeginTime: '',
                 appointEndTime: '',
+                triageOperatorName: '', // 分诊人员姓名
+                receptionOperatorName: '', // 接诊人员姓名
+                assistantBeginTime: '', // 助诊意向开始时间
+                assistantEndTime: '', //助诊意向结束时间
+                assistantRemark: '', // 助诊备注
+                triageDepartmentId: '', // 分诊科室id,
+                triageDepartment: '', // 分诊科室名
+                triageRemark: '', // 分诊备注
+                receptionBeginTime: '', // 接诊意向开始时间
+                receptionEndTime: '', // 接诊意向结束时间
                 // 患者信息
                 patientName: '',
                 idCardType: 1,
@@ -509,7 +519,8 @@ export default {
                 userDepartment: '',
                 userMobile: '',
                 patientRelation: '',
-                //医生信息
+                // crrsName: '', // 招募人
+                // 医生信息
                 doctorName: '',
                 doctorTitle: '',
                 doctorHospital: '',
@@ -517,6 +528,7 @@ export default {
                 doctorMobile: '',
                 doctorSource: '',
                 serviceFee: '',
+                outsideDoctor: '', // 站外医生姓名
                 // 问诊信息
                 diagnoseStage: '',
                 determineFlag: '',
@@ -535,6 +547,20 @@ export default {
                 remark: '',
                 maritalStatus: 2,
                 createType: 1 , ////创建方式1.系统创建 2.手动创建
+                // 备注信息
+                patInFlag: '', // 患者是否在场 1是 2否
+                valueFlag: '', // 是否有价值 1是 2否
+                worthlessReason: '', // 无价值原因
+                otherRemark: '', // 其他备注
+                // 结算信息
+                receptionServiceFee: 0, // 接诊医生服务费单位分
+                receptionServiceFeeStr: '', // 接诊医生服务费展示字段
+                receptionPayType: '', // 接诊医生付款方式1自动打款2手动打款
+                receptionSettleTime: '', // 接诊医生结算时间
+                assistantServiceFee: 0, // 助诊医生服务费单位分
+                assistantServiceFeeStr: '', // 助诊医生服务费展示字段
+                assistantPayType: '', // 助诊医生付款方式1自动打款2手动打款
+                assistantSettleTime: '', // 助诊医生结算时间
                 // 录像信息
                 vodList: {
                   name: '',
@@ -627,42 +653,17 @@ export default {
                     );
                 }
             },
-            logData: [{
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }, {
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }, {
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }, {
+            // 操作日志数据
+            /* 元素结构
+             {
                 operateTime: '2016-05-02',
                 operateUserName: '赵丽颖',
                 to: '问诊状态由已完成变成已结算',
                 from: '助诊医生时间不匹配'
-            }, {
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }, {
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }, {
-                operateTime: '2016-05-02',
-                operateUserName: '赵丽颖',
-                to: '问诊状态由已完成变成已结算',
-                from: '助诊医生时间不匹配'
-            }],
+            }
+            */
+            logData: [],
+            // 分页功能与产品沟通不做
             // logCurrentPage: 1,
             // logTotalCount: 0
         }

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

@@ -220,7 +220,7 @@
           ></table-component>
         </el-tab-pane>
       </el-tabs>
-      <match-component :matchVisible.sync="matchVisible"></match-component>
+      <match-component @search="search" :matchVisible.sync="matchVisible" :diagnoseLogId="diagnoseLogId"></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>
@@ -304,7 +304,7 @@ export default {
       totalRows: 0,
       timeClickFlag: true,
       tableHeight: 500,
-      diagnoseLogId:"",
+      diagnoseLogId: 0,
       matchVisible:false,
       refundVisible:false,
       followupVisible:false,
@@ -452,6 +452,7 @@ export default {
     //更换运营
     changeRun(row) {
       this.matchVisible = true;
+      this.diagnoseLogId = row.diagnoseLogId;
     },
     //查看详情/编辑详情
     goDetail(row,flag) {
@@ -464,7 +465,6 @@ export default {
     cancelRefund(row) {
       this.refundVisible = true;
       this.diagnoseLogId = row.diagnoseLogId;
-      console.log(row);
     },
     //设为稍后跟进
     witeGo(row) {},