Merge branch 'main' of http://42.192.7.176:3000/suojin/physical_examination_front into main

src/views/booknumber/index.vue

@@ -14,6 +14,10 @@
       <template slot-scope="{row}" slot="people">
         <div :class="row.detailList.find(item => item.numberNum == item.apmNum) ? 'cla' :''" v-for="item1 in row.detailList.map(item => item.apmNum)" >{{item1}}</div>
       </template>
+      <template slot-scope="{row}"
+                slot="hosId">
+        <span v-text='row.createDeptName'></span>
+      </template>
       <template slot-scope="{row}" slot="menu">
         <el-button  @click="handleRegister(row)">修改</el-button>
       </template>
@@ -44,7 +48,7 @@
             
           </el-tab-pane>
         </el-tabs>
-        <span style="margin-right:10px">选择医院</span> <el-select  v-model="deptName">
+        <span v-show="isShowHos" style="margin-right:10px">选择医院</span> <el-select v-show="isShowHos"  v-model="deptName">
           <el-option
             v-for="item in hospitalArr"
             :key="item.id"
@@ -169,12 +173,13 @@ export default {
             label:'医院',
             prop:'hosId',
             type:'select',
-            hide: true,
+            // hide: true,
             viewDisplay:false,
             props: {
               label: 'deptName',
               value: 'id'
             },
+            slot:true,
             dicUrl: '/api/blade-system/dept-hospital/list-hospital',
             search:true
           },
@@ -221,17 +226,19 @@ export default {
       isSelect:false,
       hospitalArr:[],
       isEdit:false,
-      valTime:''
+      valTime:'',
+      isShowHos:false
     };
   },
   computed: {
    
   },
   mounted() {
-    console.log(this.userInfo)
     if(this.userInfo.role_name !== 'hospital'){
+      // this.isShowHos = true
       this.option.column.find(item => item.prop == "hosId").search = true
     }else{
+      // this.isShowHos = false
       this.option.column.find(item => item.prop == "hosId").search = false
     }
     var validateTime = (rule, value, callback)=>{
@@ -367,16 +374,13 @@ export default {
   methods: {
     clickCalc(day){
       let tmp = this.dayArr.find(item => item == day)
-      console.log(tmp)
       if(!tmp){
         this.dayArr.push(day)
       }else{
         this.dayArr = this.dayArr.filter(item => item != tmp)
       }
-      // console.log(this.dayArr)
     },
     spanMethod({ row, column, rowIndex, columnIndex }) {
-      // console.log(column)
     },
     beforeOpen(done, type) {
       done();
@@ -390,6 +394,7 @@ export default {
       this.activeName = this.tabArr[0].dictValue;
       this.isNumber = true;
       this.isShow = true;
+      this.deptName = ''
       this.tabArr.map(item =>{
         item.addForm={
               addData: [
@@ -432,15 +437,17 @@ export default {
       })
       if(this.userInfo.role_name !== "hospital"){
         this.selectDay = new Date().getTime();
-        this.tabArr.map(item =>{
-          item.addOption.column.find(item1 => item1.prop == "select").display = true
-        })
+        this.isShowHos = true
+        // this.tabArr.map(item =>{
+        //   // item.addOption.column.find(item1 => item1.prop == "select").display = true
+        // })
         
       }else{
           this.selectDay = new Date().getTime() + 3600 * 1000 * 24 * 7;
-          this.tabArr.map(item =>{
-            item.addOption.column.find(item1 => item1.prop == "select").display = false
-          })
+          this.isShowHos = false
+          // this.tabArr.map(item =>{
+          //   // item.addOption.column.find(item1 => item1.prop == "select").display = false
+          // })
         
       }
     },
@@ -537,10 +544,8 @@ export default {
           }
         })
         // this.tabArr = this.tabArr.filter(item => item.dictValue == this.activeName)
-        // console.log(this.tabArr)
           
       })
-      console.log(this.tabArr)
     },
     handleClick(tab, event){
       let tmp = this.tabArr.find(item => item.dictValue == tab.label);
@@ -585,12 +590,20 @@ export default {
     },
     
     handleSubmit(value,done){
-      console.log(this.tabArr)
       this.count = 0;
       this.tabArr.map(item =>{
         item.addForm.addData.map(item1 => this.count += item1.num)
         item.addForm.addData1.map(item1 => this.count += item1.num)
       })
+      if(this.userInfo.role_name !== "hospital"){
+        if(this.deptName == ''){
+          this.$message.error('请选择医院')
+          return
+        }
+      }else{
+        console.log(this.userInfo)
+        this.deptName = this.userInfo.dept_id 
+      }
       
       if(this.tabArr[0].addForm.addData.length == 0 && this.tabArr[1].addForm.addData.length == 0 
         && this.tabArr[2].addForm.addData.length == 0 && this.tabArr[0].addForm.addData1.length == 0
@@ -646,7 +659,6 @@ export default {
       }
       let configListVOS = []
       this.tabArr.map(item =>{
-        console.log(item)
         configListVOS.push({
           createDept:values.createDept,
           project:item.dictValue,
@@ -697,7 +709,7 @@ export default {
                     item1.detailList.push({
                       period:'下午',
                       timeFrame:startTime + '-' + endTime,
-                      numberNum:item.num,
+                      numberNum:item3.num,
                     })
                   }
                 })
@@ -707,7 +719,7 @@ export default {
         configListVOS = configListVOS.filter(item => item.detailList.length !== 0);
         values.configListVOS = configListVOS
       }
-      console.log(values)
+      // console.log(values)
       addExamProject(values).then(res =>{
         console.log(res)
        if(res.data.code == 200){
@@ -754,7 +766,6 @@ export default {
         this.query.hosId = this.userInfo.dept_id
       }
        if(releaseTime){
-        console.log(this.query)
           values = {
             startTime:this.query.releaseTime[0],
             endTime:this.query.releaseTime[1],
@@ -772,7 +783,6 @@ export default {
           }
         }
         getNumList(page.currentPage, page.pageSize,values).then(res =>{
-          console.log(res)
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;