Merge branch 'feature/fs' into 'develop'

save

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!45

src/components/common/diagnoseAdvice.vue

 <template>
-  <div class="diagnoseAdvice">
-    <div class="header"> <span class="headernum"> 问诊单1233 诊断建议</span> <el-button>退出</el-button></div>
+  <div class="diagnoseAdvice" >
+    <div class="header"> <span class="headernum"> 问诊单1233 诊断建议</span> <el-button @click="$emit('update:showAdvices', false);">退出</el-button></div>
     
     <!-- <el-form-item label="音频" >
         <upload-music :isDisable="editorType== 2" :musicList="formData.illnessAudioUrls" ref="musicComponent"></upload-music>
@@ -10,10 +10,12 @@
     </div>
     <div class="record">
       <span>录音/录像</span>
-      <el-link href="" target="_blank">___________ .mp4</el-link>
+      <div v-for="adlist in Adviceslist.adviceAudioUrls" :key="adlist.diagnoseId">
+        <el-link :href="adlist" target="_blank">{{adlist}}</el-link>
       </div>
+    </div>
     <div class="footer">
-       <el-button type="primary" style="height:35px">提交保存</el-button>
+       <el-button type="primary" style="height:35px" @click="Submit()">提交保存</el-button>
     </div>
   </div>
 </template>
@@ -28,7 +30,47 @@ export default {
         diagnoseAdvice:'',
         advice:"",
         vodList:[{url:'upload-music'},{url:'upload-music'},{url:'upload-music'}]
+      },
+    }
+  },
+  props:{
+    showAdvices:{
+      type:Boolean,
+      default:false
+    },
+    diagnoseId:{
+      type:Number,
+      default:0
+    },
+    Adviceslist:{
+      type:Object,
+      default:{}
+    }
+  },
+  created() {
+     
+  },
+  methods:{
+    Submit() {
+      let params = {
+        adviceAudioUrls: this.Adviceslist.adviceAudioUrls,
+        content: this.formData.advice,
+        diagnoseId: 11,
+        illnessAudioUrls: this.Adviceslist.illnessAudioUrls
       }
+      this.POST('/diagnose/admin/diagnose/doctorAdvice/create',params).then(res=>{
+        if(res.code == "000000"){
+          // this.$message.success(res.data.message)
+          this.$emit('update:showAdvices', false);
+          this.showAdvices = false
+          this.$message({
+            message: "保存成功",
+            type: "success",
+          });
+        }
+      }).catch(err=>{
+        console.log(err);
+      })
     }
   }
 }

src/components/common/inquirylist.vue

@@ -48,7 +48,7 @@
           </el-card>
       </el-col>
     </el-row>
-    <diagnoseAdvice v-if="showAdvices"></diagnoseAdvice>
+    <diagnoseAdvice v-if="showAdvicesflag" :Adviceslist="Adviceslist" :.sync= showAdvices></diagnoseAdvice>
   </div>
 </template>
 
@@ -64,8 +64,8 @@ export default {
       inquiry:{
         online:true,
         answer:null,
-        imgshowdoc:true,
-        imgshowhelp:true,
+        imgshowdoc:false,
+        imgshowhelp:false,
         imgshow:true,
         docavator:'',
         write:false,
@@ -75,7 +75,9 @@ export default {
       timer:null,
       flag:true,
       nomor:true,
-      showAdvices:false
+      showAdvices:false,
+      showAdvicesflag:false,
+      Adviceslist:{}
     };
   },
   props:{
@@ -127,6 +129,8 @@ export default {
         let starttime =this.item.appointBeginTime.slice(0,10)
         let endtime = `${this.item.appointBeginTime.slice(11,16)}-${this.item.appointEndTime.slice(11,16)}`
         return starttime +' '+ endtime
+      }else{
+        return ''
       }
     },
   },
@@ -145,13 +149,22 @@ export default {
             this.inquiry.imgshow = true
             this.flag = true
           }
-          console.log(nums,this.inquiry.imgshow);
         }, 1000);
       }
 
     },
     showAdvice() {
-      this.showAdvices = true
+            this.showAdvicesflag = true;
+            this.showAdvices = true;
+      this.GET(`/diagnose/admin/diagnose/doctorAdvice/list/11`).then(res=>{
+        if(res.code == '000000'){
+          console.log(res);
+        //  this.Adviceslist=  res.data ;
+        }
+      }).catch(err=>{
+        console.log(err);
+      })
+
     },
     openChat () {
       if(this.showChat){

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

@@ -9,7 +9,8 @@
          <div id="picker">
              <div class="block">
             <el-date-picker
-            v-model="value1"
+            @change="changeDatetime"
+            v-model="Datevalue"
             type="date"
             clear-icon="el-input-icon"
             :clearable='false'>
@@ -18,17 +19,17 @@
          </div>
         </el-row>
         <!-- tab栏 -->
-      <div id="radio">
+      <div id="radio"></div>
       <el-radio-group v-model="tabPosition" style="margin-bottom: 30px;" >
-      <el-radio-button label="all">全部({{currentCalList}})</el-radio-button>
-      <el-radio-button label="abnormal">异常({{currentCalList}})</el-radio-button>
-      <el-radio-button label="consultation">问诊中({{currentCalList}})</el-radio-button>
-      <el-radio-button label="Notstarted">未开始({{currentCalList}})</el-radio-button>
-      <el-radio-button label="Hasended">已结束({{currentCalList}})</el-radio-button>
-      <el-radio-button label="Cancelled">已取消({{currentCalList}})</el-radio-button>
+      <el-radio-button label="99">全部({{currentCalList}})</el-radio-button>
+      <el-radio-button label="1">异常({{currentCalList}})</el-radio-button>
+      <el-radio-button label="2">问诊中({{currentCalList}})</el-radio-button>
+      <el-radio-button label="3">未开始({{currentCalList}})</el-radio-button>
+      <el-radio-button label="4">已结束({{currentCalList}})</el-radio-button>
+      <el-radio-button label="5">已取消({{currentCalList}})</el-radio-button>
       </el-radio-group>
       <div class="forbox">
-        <div class="for" v-for="(item, index) in currentDiagList" :key="'for'+index">
+        <div class="for" v-for="(item, index) in list" :key="'for'+index">
           <inquiryList-component :item="item"></inquiryList-component>
         </div>
       </div>
@@ -38,11 +39,11 @@
         background
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :current-page="currentPage4"
-        :page-sizes="[100, 200, 300, 400]"
-        :page-size="100"
+        :current-page="searchParam.pageNo"
+        :page-sizes="[6, 12, 18, 24]"
+        :page-size="searchParam.pageSize"
         layout="prev, pager, next, sizes, jumper"
-        :total="400">
+        :total="totalRows">
       </el-pagination>
       </el-row>
     </div>
@@ -65,10 +66,19 @@ export default {
   },
    data(){
      return {
-       tabPosition:"all",
-       value1:Date.now(),
+       tabPosition:"1",
+       Datevalue:new Date().toLocaleDateString().split('/').join('-'),
        currentPage4:0,
        showChat: true,
+       totalRows:40,
+       loading:false,
+       searchParam: {
+        dateTime: this.Datevalue,
+        operateUserId: localStorage.getItem('userID'),
+        returnStatus: 1,
+        pageSize: 6,
+        pageNo: 1,
+        },
        list: [
           {
             "appointBeginTime": "2021-07-29T05:28:57.396Z",
@@ -102,12 +112,34 @@ export default {
    created(){
    },
    methods:{
-     handleSizeChange(){
-
+     handleSizeChange(val){
+       this.searchParam.pageSize = val
+       this.search()
      },
-     handleCurrentChange(){
-
+     handleCurrentChange(val){
+       this.searchParam.pageNo = val
+       this.search()
+     },
+     changeStatus(val){
+       this.searchParam.returnStatus = val
+       this.searchParam.pageNo = 1
+       this.search()
      },
+     changeDatetime(val) {
+       this.searchParam.dateTime = val.toLocaleDateString().split('/').join('-')
+       this.searchParam.pageNo = 1
+       this.search()
+     },
+     search() {
+      let params = this.searchParam
+      this.loading = true
+       this.POST('/diagnose/admin/diagnose/operator/list',params).then(res=>{
+         if(res.code == '000000'){
+           this.loading = false
+           console.log(res);
+         }
+       })
+     }
    },
 }
 </script>

src/views/layout/slidebar.vue

@@ -68,6 +68,7 @@ export default {
       this.POST("/basic-data/menu/list", { systemType: this.systemType }).then(res => {
         if (res.code == "000000") {
           let { vueMenuDtos } = res.data;
+          localStorage.setItem('userID', res.data.userId)
           // let vueMenuDtos = [];
 
           // // TODO 开发调试时写死, 发布时去掉