From 1e823aac46fa0f715328b7db33c73700e17e6232 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Fri, 17 Feb 2023 19:07:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=BE=E5=8F=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/booknumber/index.vue | 56 +++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/views/booknumber/index.vue b/src/views/booknumber/index.vue
index 78458a4..a4e58b0 100644
--- a/src/views/booknumber/index.vue
+++ b/src/views/booknumber/index.vue
@@ -39,10 +39,19 @@
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane  :label="item.dictValue" :name="item.dictValue" v-for="item in tabArr" :key="item.dictValue">
             <div class="form_box">
-              <avue-form ref="addFrom" :option="item.addOption" v-model="item.addForm" @submit="handleSubmit"></avue-form>
+              <avue-form ref="addFrom" :option="item.addOption" v-model="item.addForm"></avue-form>
             </div>
+            
           </el-tab-pane>
         </el-tabs>
+        <span style="margin-right:10px">选择医院</span> <el-select  v-model="deptName">
+          <el-option
+            v-for="item in hospitalArr"
+            :key="item.id"
+            :label="item.deptName"
+            :value="item.id">
+          </el-option>
+        </el-select>
       </div>
       <div v-show="!isShow">
         <el-calendar v-model="calValue">
@@ -55,6 +64,10 @@
         </template>
         </el-calendar>
       </div>
+      <div class="button_box" >
+        <el-button @click="closeDraw">取消</el-button>
+        <el-button type="primary" @click="handleSubmit">提交</el-button>
+      </div>
       <div class="button_box" v-show="!isShow">
         <el-button @click="closeDraw">取消</el-button>
         <el-button type="primary" @click="clickSubmit">提交</el-button>
@@ -64,13 +77,14 @@
 </template>
 
 <script>
-import {getNumList,getExamProject,addExamProject,getHosList,examProjectDetail} from "@/api/booknumber/booknumber";
+import {getNumList,getExamProject,addExamProject,getHosList,examProjectDetail,} from "@/api/booknumber/booknumber";
 import {getUserInfo,getList} from '@/api/system/user'
 import { mapGetters } from "vuex";
 export default {
   data() {
     
     return {
+      deptName:"",
       form: {},
       selectionList: [],
       query: {},
@@ -246,6 +260,8 @@ export default {
             dictValue:item.dictValue,
             dictKey:item.dictKey,
             addOption:{
+              submitBtn:false,
+              emptyBtn:false,
               column: [
                 {
                   label:'上午',
@@ -335,24 +351,6 @@ export default {
                     ]
                   }
                 },
-                {
-                  label: '投放医院',
-                  prop: 'select',
-                  type: 'select',
-                  props: {
-                    label: 'deptName',
-                    value: 'id'
-                  },
-                  display:true,
-                  dicUrl: '/api/blade-system/dept-hospital/list-hospital',
-                  rules: [
-                          {
-                            required: true,
-                            message: '请选择投放医院',
-                            trigger: 'blur'
-                          }
-                        ]
-                }
               ]
             },
             addForm:{
@@ -430,7 +428,6 @@ export default {
                   num: 0
                 }
               ],
-              select:''
             }
       })
       if(this.userInfo.role_name !== "hospital"){
@@ -462,6 +459,7 @@ export default {
         this.isShow = true;
         this.activeName = data[0].project;
         // let val = this.tabArr.find(item => item.dictValue == this.activeName);
+        
         this.tabArr.map(item => {
             if(this.userInfo.role_name !== 'hospital'){
               item.addOption.column.find(item => item.prop == "select").display = true;
@@ -538,7 +536,8 @@ export default {
             return
           }
         })
-        
+        // this.tabArr = this.tabArr.filter(item => item.dictValue == this.activeName)
+        // console.log(this.tabArr)
           
       })
       console.log(this.tabArr)
@@ -638,14 +637,18 @@ export default {
     },
     // 提交放号
     clickSubmit(){
+      // this.tabArr.find(item => {
+      //   console.log('ces =>', item.addForm.select)
+      // })
       let values = {
         dayList:this.dayArr,
-        createDept:this.addForm1.select == undefined ? this.userInfo.dept_id : this.addForm1.select,
+        createDept:this.deptName,
       }
       let configListVOS = []
       this.tabArr.map(item =>{
+        console.log(item)
         configListVOS.push({
-          createDept:this.addForm1.select == undefined ? this.userInfo.dept_id : this.addForm1.select,
+          createDept:values.createDept,
           project:item.dictValue,
           detailList:[]
         })
@@ -704,7 +707,7 @@ export default {
         configListVOS = configListVOS.filter(item => item.detailList.length !== 0);
         values.configListVOS = configListVOS
       }
-      
+      console.log(values)
       addExamProject(values).then(res =>{
         console.log(res)
        if(res.data.code == 200){
@@ -781,6 +784,9 @@ export default {
 </script>
 
 <style lang='scss' scoped>
+::v-deep .el-tabs__content{
+  height: 550px;
+}
 ::v-deep .cla{
   color: #F93A4A;
 }