Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/project/project.js

       method:"Get",
       params:params
     })
-  }
+  }
+
+  export function getAllDePartmentList(params){
+   
+    return request({
+      url:"/api/hispatient/getalldepartmentlist",
+      method:"Get",
+      params:params
+    })
+  } 

src/api/role/admin.js

   })
 }
 
-export function addAdmin(mobile, name, type, title, role, intro, user_title_name) {
+export function addAdmin(mobile, name, type, title, role, intro, user_title_name,department,department_id) {
   const params = {
     mobile: mobile,
     name: name,
     title: title,
     role: role,
     intro: intro,
-    user_title_name: user_title_name
+    user_title_name: user_title_name,
+    department:department,
+    department_id:department_id,
   }
+  console.log("epa",department_id,department)
+  
   return request({
     url: '/api/admin/add',
     method: 'post',
   })
 }
 
-export function modifyAdmin(uid, name, type, title, role, intro, user_title_name, sort) {
+export function modifyAdmin(uid, name, type, title, role, intro, user_title_name, sort,department,department_id) {
+  console.log("进来",department,department_id)
   const params = {
     uid: uid,
     name: name,
     role: role,
     intro: intro,
     user_title_name: user_title_name,
-    sort: sort
+    sort: sort,
+    department:department,
+    department_id:department_id
   }
+ 
+ 
   return request({
     url: '/api/admin/edit',
     method: 'post',

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

         console.log('val', val.name)
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == val.name) {
+
             this.curPrescriptions = {}
             var temp = this.deepClone(this.prescriptions[i])
             this.curPrescriptions = temp
             this.addtions_charge = response.data.data.addtions_charge
 
             this.prescriptions = []
+            console.log("9991323242r5253535",response.data.data.prescription)
+            this.prescription_id = response.data.data.prescription[0].advices[0].prescription_id
+            console.log("222222",this.prescription_id)
             for (let i = 0; i < response.data.data.prescription.length; i++) {
               var prescription = response.data.data.prescription[i]
 
     margin-left: 5px;
     display: flex;
     flex-direction: column;
+    overflow-y: auto;
   }
 
   .RP {

src/xt_pages/outpatientCharges/print.vue

       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain p{width: 50%;line-height: 1px;}.prescriptionBox{padding:0 10px;height:750px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+        '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
       printJS({
         printable: "prescription-print",
         type: "html",

src/xt_pages/outpatientCharges/template/printOne.vue

             <p>年龄：12岁</p>
         </div>
         <div class="infoMain">
-            <p style="margin-bottom: 10px;">门诊号：111111111111</p>
-            <p style="margin-bottom: 10px;">科室：全科</p>
-            <p style="margin-bottom: 10px;">医保卡号：111111111111</p>
-            <p style="margin-bottom: 10px;">电话：111111111111</p>
-            <p>地址：加上来看待就卢萨卡的及拉丝机的了</p>
-            <p>临床诊断：拉胯手机上的拉丝机的</p>
+            <div style="margin-bottom: 10px;">门诊号：111111111111</div>
+            <div style="margin-bottom: 10px;">科室：全科</div>
+            <div style="margin-bottom: 10px;">医保卡号：111111111111</div>
+            <div style="margin-bottom: 10px;">电话：111111111111</div>
+            <div>地址：加上来看待就卢萨卡的及拉丝机的了</div>
+            <div>临床诊断：拉胯手机上的拉丝机的</div>
         </div>
         <div class="prescriptionBox">
-            <p class="Rp">Rp:</p>
+            <div class="Rp">Rp:</div>
             <div class="drugsBox">
-                <p class="drugsOne">重组人促红素（CHO细胞）注射液&nbsp;&nbsp;0.5毫升&nbsp;×&nbsp; 2支</p>
-                <p style="margin-left:100px;"><span>用法：0.5毫升</span>&nbsp;&nbsp;<span>一天一次</span>&nbsp;&nbsp;<span>静脉注射</span></p>
+                <div class="drugsOne">重组人促红素（CHO细胞）注射液&nbsp;&nbsp;0.5毫升&nbsp;×&nbsp; 2支</div>
+                <div style="margin-left:100px;"><span>用法：0.5毫升</span>&nbsp;&nbsp;<span>一天一次</span>&nbsp;&nbsp;<span>静脉注射</span></div>
             </div>
             <div class="drugsBox">
-                <p class="drugsOne">重组人促红素（CHO细胞）注射液&nbsp;&nbsp;0.5毫升&nbsp;×&nbsp; 2支</p>
-                <p style="margin-left:100px;"><span>用法：0.5毫升</span>&nbsp;&nbsp;<span>一天一次</span>&nbsp;&nbsp;<span>静脉注射</span></p>
+                <div class="drugsOne">重组人促红素（CHO细胞）注射液&nbsp;&nbsp;0.5毫升&nbsp;×&nbsp; 2支</div>
+                <div style="margin-left:100px;"><span>用法：0.5毫升</span>&nbsp;&nbsp;<span>一天一次</span>&nbsp;&nbsp;<span>静脉注射</span></div>
             </div>
         </div>
         <div class="doctorBox">
     border-bottom: 2px solid #000;
     padding:0 10px;
 }
-.infoMain p{
+.infoMain div{
     width: 50%;
     line-height: 24px;
 }
 .prescriptionBox{
     padding:0 10px;
-    height:600px;
+    min-height:450px;
 }
 .Rp{
     font-size: 22px;
     padding-left: 40px;
     margin-bottom: 10px;
 }
-.drugsBox p{
-    line-height: 30px;
+.drugsBox div{
+    line-height: 20px;
 }
 .drugsOne{
     line-height: 24px;

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

 <template>
-  <div style="height: calc(100% - 36px);display: flex;flex-direction: column;margin-top: 36px;">
+  <div style="height: calc(100% - 54px);display: flex;flex-direction: column;margin-top: 54px;">
     <!-- <div style="border-top:1px solid #e5e5e5;margin-top:5px;">
       <div class="mainCell" style="margin-bottom:10px;float:right">
         <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
         <el-button size="small" @click="open(5)" type="primary">存模板</el-button>
       </div>
     </div> -->
-    <div class="backColor"></div>
+    <!-- <div class="backColor"></div> -->
     <div class="mainCenter">
       <div class="centerLeft">
-        <el-form :model="form" ref="form" label-width="80px">
+        <el-form :model="form" ref="form" label-width="80px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
           <el-form-item label="姓名:" prop="name">
             <el-input v-model="patientInfo.name" placeholder="" readonly></el-input>
           </el-form-item>
           <!--<el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>-->
           <!--</el-form-item>-->
           <el-form-item label="挂号类型: " prop="name">
-            <el-select style="margin-right:5px;" v-model="register_type" placeholder="">
+            <el-select style="width:100%;" v-model="register_type" placeholder="">
               <el-option
                 v-for="(item,index) in getDictionaryDataConfig('system','register_type')"
                 :key="index"
               </el-option>
             </el-select>
           </el-form-item>
-          <!--<el-form-item label="医疗类型: " prop="name">-->
-          <!--<el-select style="margin-right:5px;" v-model="register_type" placeholder="">-->
-          <!--<el-option-->
-          <!--v-for="(item,index) in getDictionaryDataConfig('system','register_type')"-->
-          <!--:key="index"-->
-          <!--:label="item.name"-->
-          <!--:value="item.name">-->
-          <!--</el-option>-->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
           <el-form-item label="疾病类型:" prop="name">
 
-            <el-select style="margin-right:5px;" v-model="state1" placeholder="">
+            <el-select style="width:100%;" v-model="state1" placeholder="">
               <el-option
                 v-for="(item,index) in sick"
                 :key="index"
         </div>
       </div>
       <div class='centerRight'>
-        <div class="rightTab">
+        <!-- <div class="rightTab">
           <p :class="rightTab == 1 ? 'activeP' : ''" @click="clickTab(1)">药品</p>
           <p :class="rightTab == 2 ? 'activeP' : ''" @click="clickTab(2)">项目</p>
-        </div>
-        <template>
-          <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showOne">
-            <el-tabs class="rightTabs" v-model="activeName">
-              <el-tab-pane label="药品列表" name="1">
-                <div style="margin-bottom:5px;display:flex;">
-                  <el-input style="width:50%;" @input="searchAction" @keyup.enter.native='searchAction'
-                            v-model.trim="search_keyword"
-                            placeholder="请输入药品名字"></el-input>
-                  <el-select style="margin-left:5px;width:50%;" v-model="value" placeholder="" @change="changeKind">
-                    <el-option
-                      label="全部"
-                      value="0">
-                    </el-option>
-                    <el-option
-                      v-for="(item,index) in getDictionaryDataConfig('system','drug_type')"
-                      :key="index"
-                      :label="item.name"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
-                <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs'
-                          style="width: 100%;flex:1;overflow-y: auto;"
-                          :row-style="{ color: '#303133' }"
-                          @select-all="changeAllGoodInfoTableData"
-                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                          highlight-current-row>
-                  <el-table-column type="selection" width="40" align="center"></el-table-column>
-                  <el-table-column prop="name" label="名称">
-                    <template slot-scope="scope">{{ scope.row.drug_name }}</template>
-                  </el-table-column>
-                  <el-table-column label="规格" width="60">
-                    <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
-                  </el-table-column>
-                  <el-table-column label="单价" width="40">
-                    <template slot-scope="scope">{{ scope.row.retail_price }}</template>
-                  </el-table-column>
-                </el-table>
+        </div> -->
+        <el-tabs class="borderCard" type="border-card" v-model="rightTab" @tab-click="clickTab">
+              <el-tab-pane label="药品" :name="1">
 
               </el-tab-pane>
-              <el-tab-pane label="医嘱模板" name="2">
-                <div style="margin-bottom:5px;">
-                  <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
-                  <el-select style="float: right;width: 49%;" v-model="value" placeholder="">
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <el-table ref="multipleTableTwo" :data="advices_template" border
-                          style="width: 100%;flex:1;overflow-y: auto;"
-                          :row-style="{ color: '#303133' }"
-                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                          highlight-current-row>
-                  <el-table-column type="selection" width="40" align="center"></el-table-column>
-                  <el-table-column prop="name" label="名称">
-                    <template slot-scope="scope">{{}}</template>
-                  </el-table-column>
-                  <el-table-column label="规格" width="60">
-                    <template slot-scope="scope">33</template>
-                  </el-table-column>
-                  <el-table-column label="库存" width="60">
-                    <template slot-scope="scope">22</template>
-                  </el-table-column>
-                  <el-table-column label="单价" width="40">
-                    <template slot-scope="scope">12</template>
-                  </el-table-column>
-                </el-table>
-              </el-tab-pane>
-            </el-tabs>
-          </div>
+              <el-tab-pane label="项目" :name="2">
 
-          <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showTwo">
-            <el-tabs class="rightTabs" v-model="activeName">
-              <el-tab-pane label="项目列表" name="1">
-                <el-table ref="tables" :data="tabProject" border @select='selectChange'
-                          style="width: 100%;flex:1;overflow-y: auto;"
-                          :row-style="{ color: '#303133' }"
-                          @select-all="changeAllGoodInfoTableDataTwo"
-                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                          highlight-current-row>
-                  <el-table-column type="selection" width="40" align="center"></el-table-column>
-                  <el-table-column prop="name" label="名称">
-                    <template slot-scope="scope">{{ scope.row.project_name }}</template>
-                  </el-table-column>
-                  <el-table-column label="规格" width="60">
-                    <template slot-scope="scope">{{ scope.row.single_dose }}</template>
-                  </el-table-column>
-                  <el-table-column label="单价" width="40">
-                    <template slot-scope="scope">{{ scope.row.price }}</template>
-                  </el-table-column>
-                </el-table>
               </el-tab-pane>
-              <el-tab-pane label="项目组套" name="2">
-                <el-table :data="tabPrjectTeam" border style="width: 100%;flex:1;overflow-y: auto;"
-                          :row-style="{ color: '#303133' }"
-                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                          highlight-current-row
-                          @select='selectTeam'>
-                  <el-table-column type="selection" width="40" align="center"></el-table-column>
-                  <el-table-column prop="name" label="名称">
-                    <template slot-scope="scope">{{scope.row.project_team}}</template>
-                  </el-table-column>
-                </el-table>
-              </el-tab-pane>
-            </el-tabs>
-          </div>
+              <div style="height:100%;" v-show="showOne">
+                  <el-tabs class="rightTabs" v-model="activeName">
+                    <el-tab-pane label="药品列表" name="1">
+                      <div style="margin-bottom:5px;display:flex;">
+                        <el-input style="width:50%;"  @input="searchAction" @keyup.enter.native='searchAction' v-model.trim="search_keyword"
+                                  placeholder="请输入药品名字"></el-input>
+                        <el-select style="margin-left:5px;width:50%;" v-model="value" placeholder="" @change="changeKind">
+                          <el-option
+                            label="全部"
+                            value="0">
+                          </el-option>
+                          <el-option
+                            v-for="(item,index) in getDictionaryDataConfig('system','drug_type')"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                          </el-option>
+                        </el-select>
+                      </div>
+                      <div style="width: 100%;flex:1;overflow-y: auto;">
+                        <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs'
+                                  :row-style="{ color: '#303133' }"
+                                  @select-all="changeAllGoodInfoTableData"
+                                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                                  highlight-current-row>
+                          <el-table-column type="selection" width="40" align="center"></el-table-column>
+                          <el-table-column prop="name" label="名称">
+                            <template slot-scope="scope">{{ scope.row.drug_name }}</template>
+                          </el-table-column>
+                          <el-table-column label="规格" width="60">
+                            <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
+                          </el-table-column>
+                          <el-table-column label="单价" width="40">
+                            <template slot-scope="scope">{{ scope.row.retail_price }}</template>
+                          </el-table-column>
+                        </el-table>
+                      </div>
+
+                    </el-tab-pane>
+                    <el-tab-pane label="医嘱模板" name="2">
+                      <div style="margin-bottom:5px;">
+                        <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
+                        <el-select style="float: right;width: 49%;" v-model="value" placeholder="">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </div>
+                      <div style="width: 100%;flex:1;overflow-y: auto;">
+                        <el-table ref="multipleTableTwo" :data="advices_template" border
+                                  :row-style="{ color: '#303133' }"
+                                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                                  highlight-current-row>
+                          <el-table-column type="selection" width="40" align="center"></el-table-column>
+                          <el-table-column prop="name" label="名称">
+                            <template slot-scope="scope">{{}}</template>
+                          </el-table-column>
+                          <el-table-column label="规格" width="60">
+                            <template slot-scope="scope">33</template>
+                          </el-table-column>
+                          <el-table-column label="库存" width="60">
+                            <template slot-scope="scope">22</template>
+                          </el-table-column>
+                          <el-table-column label="单价" width="40">
+                            <template slot-scope="scope">12</template>
+                          </el-table-column>
+                        </el-table>
+                      </div>
+                    </el-tab-pane>
+                  </el-tabs>
+              </div>
+              <div style="height:100%;" v-show="showTwo">
+                <el-tabs class="rightTabs" v-model="activeName">
+                  <el-tab-pane label="项目列表" name="1">
+                    <div style="width: 100%;flex:1;overflow-y: auto;">
+                      <el-table ref="tables" :data="tabProject" border @select='selectChange'
+                                :row-style="{ color: '#303133' }"
+                                @select-all="changeAllGoodInfoTableDataTwo"
+                                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                                highlight-current-row>
+                        <el-table-column type="selection" width="40" align="center"></el-table-column>
+                        <el-table-column prop="name" label="名称">
+                          <template slot-scope="scope">{{ scope.row.project_name }}</template>
+                        </el-table-column>
+                        <el-table-column label="规格" width="60">
+                          <template slot-scope="scope">{{ scope.row.single_dose }}</template>
+                        </el-table-column>
+                        <el-table-column label="单价" width="40">
+                          <template slot-scope="scope">{{ scope.row.price }}</template>
+                        </el-table-column>
+                      </el-table>
+                    </div>
+                  </el-tab-pane>
+                  <el-tab-pane label="项目组套" name="2">
+                    <div style="width: 100%;flex:1;overflow-y: auto;">
+                      <el-table :data="tabPrjectTeam" border
+                                :row-style="{ color: '#303133' }"
+                                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                                highlight-current-row
+                                @select='selectTeam'>
+                        <el-table-column type="selection" width="40" align="center"></el-table-column>
+                        <el-table-column prop="name" label="名称">
+                          <template slot-scope="scope">{{scope.row.project_team}}</template>
+                        </el-table-column>
+                      </el-table>
+                    </div>
+                  </el-tab-pane>
+                </el-tabs>
+              </div>
+        </el-tabs>
+        <template>
+
+
+
 
           <div class="comfirmBox">
             <!-- <div>
                 </el-option>
               </el-select>
             </div> -->
-            <el-button type="primary" size="small" @click="comfirm">确定添加</el-button>
+            <el-button type="primary" size="small" style="width:100%;" @click="comfirm">确定添加</el-button>
           </div>
         </template>
       </div>
 
       },
       tabclickEvent(val) {
-        console.log(this.editableTabsValue)
-
         for (let i = 0; i < this.prescriptions.length; i++) {
           console.log(this.prescriptions[i].name)
           if (this.prescriptions[i].name == val.name) {
-            console.log('2323323', this.prescriptions)
+            console.log("2323323",this.prescriptions)
             this.prescription_id = this.prescriptions[i].id
             this.$emit('event1', this.prescription_id)
             this.curPrescriptions = this.prescriptions[i]
           })
 
       },
-      clickTab(index) {
+      clickTab(tab) {
+        let index = parseInt(tab.name)
         if (index == 1) {
           if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
             this.$message.error('当前处方为项目，无法切换为药品，需要新开处方')
   .mainCenter {
     display: flex;
     flex: 1;
+    height: 100%;
   }
 
   .centerLeft {
     position: relative;
 
   .el-form-item {
-    width: 32%;
-    margin-right: 1%;
-    float: left;
+    width: 33%;
+    margin-bottom: 14px;
   }
 
   .el-form-item__label {
 
   .RP {
     color: #409EFF;
-    font-size: 20px;
+    font-size: 14px;
     margin-bottom: 5px;
   }
 
     height: 76%;
     overflow-y: auto;
     margin-bottom: 60px;
-
+    margin-top: 4px;
   .el-tabs__item {
     padding: 0 10px;
   }
 
   .centerRight {
     width: 300px;
-    margin-left: 5px;
+    margin-left: 10px;
     display: flex;
     flex-direction: column;
     position: relative;
     align-items: center;
     justify-content: space-between;
   }
+  .borderCard{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    margin-bottom: 60px;
+    .el-tabs--border-card>.el-tabs__content{
+      padding: 0;
+    }
+  }
 </style>
 
 <style lang="scss">
+.borderCard{
+  .el-tabs__nav{
+    width: 100%;
+  }
+  .el-tabs__item{
+    width: 50%;
+    text-align: center;
+  }
+  .el-tabs__content{
+    padding: 5px;
+    flex: 1;
+  }
+}
   .centerLeft {
 
   .el-form-item__label {
   .el-tabs__content {
     flex: 1;
     overflow-y: auto;
+    padding: 5px 0 5px 5px;
   }
 
   }
   .rightTabs {
     height: 100%;
-
+    .el-tabs__nav{
+      width: auto;
+    }
+    .el-tabs__header{
+      margin-bottom: 5px;
+    }
+  .el-tabs__item{
+    width: auto;
+    text-align: inherit;
+  }
   .el-tabs__content {
     flex: 1;
     overflow-y: auto;

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

 <template>
-  <div class="deskRecord" style="margin-top:36px;">
+  <div class="deskRecord" style="margin-top:54px;">
     <!-- <div style="overflow:hidden;border-top:1px solid #e5e5e5;margin-top:5px;">
       <div class="mainCell" style="margin-bottom:10px;float:right">
         <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
         <el-button size="small" @click="open(4)" type="primary">存模板</el-button>
       </div>
     </div> -->
-    <div class="backColor"></div>
     <div class="mainTitle">基本信息：</div>
     <el-form class="basicForm" :model="patientInfo" ref="form" label-width="120px">
       <el-form-item label="姓名:" prop="name">
 
       // },
       createCaseHistory() {
-        console.log("触发了吗")
           if(this.patientInfo.id == undefined){
             this.$message.error("请先选择病人")
             return
               var caseHistory = response.data.data.caseHistory
               console.log("caseHistory",caseHistory)
               this.$message.success("保存成功")
+              this.doctor_advice = ""
+              this.remark = ""
             }
           })
        

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
-    <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
+    <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
         <div class="mainCell" style="justify-content: space-between;">
-          <p>未就诊：<span>{{cal_one}}</span>人</p>
-          <p>已就诊：<span>{{cal_two}}</span>人</p>
+          <p style="font-size:14px;">未就诊：<span>{{cal_one}}</span>人</p>
+          <p style="font-size:14px;">已就诊：<span>{{cal_two}}</span>人</p>
         </div>
         <div class="mainCell">
           <el-radio-group v-model="radio" @change="change">
       </div>
       <div class="mainRight">
         <div class="mainHeader">
-          <el-radio-group class="titleBox" v-model="titleType" @change="changeTab">
-            <el-radio-button label="电子处方"></el-radio-button>
-            <el-radio-button label="电子病历"></el-radio-button>
-          </el-radio-group>
+          <el-tabs v-model="titleType" @tab-click="handleClick" style="position: fixed;width: calc(100% - 490px);background:#fff;">
+            <el-tab-pane label="电子处方" name="电子处方"></el-tab-pane>
+            <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
+          </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
-            <el-button size="small" ref="button_one"   @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
+            <el-button size="small" ref="button_one"   @click="open(1)" type="primary">保存</el-button>
             <el-popover
               placement="bottom"
               width="200"
             <el-button size="small" ref="button_four"  @click="open(5)" type="primary">存模板</el-button>
           </div>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
-            <el-button size="small" @click="opentwo(1)" type="primary" style="margin-left:10px;">保存</el-button>
+            <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>
             <el-button size="small" @click="opentwo(2)" type="primary">打印</el-button>
             <el-button size="small" @click="opentwo(3)" type="primary">病历调用</el-button>
             <el-button size="small" @click="opentwo(4)" type="primary">存模板</el-button>
 
   }
   .mainRight {
-    margin-left: 20px;
+    margin-left: 10px;
     flex: 1;
     height: 100%;
     display: flex;
 
   .centerRight {
     width: 300px;
-    margin-left: 5px;
+    margin-left: 10px;
     display: flex;
     flex-direction: column;
     position: relative;
     z-index: 99;
     right: 30px;
     background: #fff;
+    width: 300px;
+    display: flex;
+    justify-content: space-between;
   }
 </style>
 

src/xt_pages/outpatientDoctorStation/print.vue

 <template>
   <div class="main-contain">
     <div class="position">
-      <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
        <template>
         <el-button
           :loading="loading"
   },
   data() {
     return {
+      crumbs: [
+        { path: false, name: '门诊医生站' },
+        { path: false, name: '打印' }
+      ],
        record_date:"",
        patientTableData:[],
        advicePrint:[],
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain p{width: 50%;line-height: 1px;}.prescriptionBox{padding:0 10px;height:750px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+        '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
       printJS({
         printable: "prescription-print",
         type: "html",

src/xt_pages/outpatientDoctorStation/printtwo.vue

             </div>
             
             <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
-              <printTwo v-bind:childResponse="childResponse" :advicePrint="advicePrint" :patient="patient" :hisPatient="hisPatient"></printTwo>
+              <printTwo v-bind:childResponse="childResponse" :advicePrint="advicePrint" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
             </div>
         </el-container>
     </div>
        patientTableData:[],
        advicePrint:[],
        hisPatient:{},
-       patient:{}
+       patient:{},
+       patient_id:0,
+       prescription_id:0,
     };
   },
   methods:{
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain p{width: 50%;line-height: 1px;}.prescriptionBox{padding:0 10px;height:750px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+        '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
       printJS({
         printable: "prescription-print",
         type: "html",
 
     changePatient(row){
       console.log("row",row)
-        var params = {
-          patient_id:row.patient_id,
-          record_date:this.record_date,
-        }
-      getPrescriptionPrint(params).then(response=>{
-          if(response.data.state == 1){
-            var advicePrint =  response.data.data.advicePrint
-            console.log("adviceprint",advicePrint)
-            this.advicePrint = advicePrint
-            // var hisPatient =  response.data.data.hisPatient
-            // console.log("hispatient",hisPatient)
-            // this.hisPatient = hisPatient
-            var patient =  response.data.data.patient
-            console.log("patient",patient)
-            this.patient = patient
-            var doctorPorject = response.data.data.doctorPorject
-            console.log("doctorporject",doctorPorject)
-          }
-      })
+      this.patient_id = row.patient_id
+      this.record_date = this.record_date
+      this.prescription_id = this.prescription_id
+      //   var params = {
+      //     patient_id:row.patient_id,
+      //     record_date:this.record_date,
+      //   }
+      // getPrescriptionPrint(params).then(response=>{
+      //     if(response.data.state == 1){
+      //       var advicePrint =  response.data.data.advicePrint
+      //       console.log("adviceprint",advicePrint)
+      //       this.advicePrint = advicePrint
+      //       // var hisPatient =  response.data.data.hisPatient
+      //       // console.log("hispatient",hisPatient)
+      //       // this.hisPatient = hisPatient
+      //       var patient =  response.data.data.patient
+      //       console.log("patient",patient)
+      //       this.patient = patient
+      //       var doctorPorject = response.data.data.doctorPorject
+      //       console.log("doctorporject",doctorPorject)
+      //     }
+      // })
     }
     
   },
     var record_date = this.$route.query.record
     this.record_date = record_date
     console.log("record_date",record_date)
+    this.patient_id = this.$route.query.patient_id
+    this.prescription_id = this.$route.query.prescription_id
     this.getAllHisPatientList(record_date)
   },
 

src/xt_pages/outpatientDoctorStation/recordPrint.vue

       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 1px;padding:0 10px;}.infoTitle p{width: 200px;}.otherInfo{display: flex;margin-top:10px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle p{width: 200px;}}';
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle div{width: 200px;}}';
       printJS({
         printable: "prescription-print",
         type: "html",

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

     <div id='prescription-print' class="prescription-print">
         <div class="printTitle">门诊病历</div>
         <div class="infoTitle">
-            <p>姓名：{{patient.name}}</p>
-            <p>性别：
+            <div>姓名：{{patient.name}}</div>
+            <div>性别：
                 <span v-if="patient.gender == 1">男</span>
                 <span v-if="patient.gender == 2">女</span>
-            </p>
-            <p>年龄：{{patient.age}}岁</p>
+            </div>
+            <div>年龄：{{patient.age}}岁</div>
         </div>
         <div class="infoTitle">
-            <p>婚姻状况：
+            <div>婚姻状况：
               <span v-if="patient.marital_status == 1">已婚 </span>
               <span v-if="patient.marital_status == 2">未婚 </span>
-            </p>
-            <p>职业：{{getProfession(patient.profession)}}</p>
+            </div>
+            <div>职业：{{getProfession(patient.profession)}}</div>
         </div>
         <div class="otherInfo">
-            <p>医保号：</p>
-            <p style="flex:1;">{{patient.health_care_no}}</p>
+            <div>医保号：</div>
+            <div style="flex:1;">{{patient.health_care_no}}</div>
         </div>
         <div class="otherInfo">
-            <p>联系电话：</p>
-            <p style="flex:1;">{{patient.phone}}</p>
+            <div>联系电话：</div>
+            <div style="flex:1;">{{patient.phone}}</div>
         </div>
         <div class="otherInfo">
-            <p>通讯地址：</p>
-            <p style="flex:1;">{{patient.home_address}}</p>
+            <div>通讯地址：</div>
+            <div style="flex:1;">{{patient.home_address}}</div>
         </div>
         <div class="otherInfo">
-            <p>药物过敏史：</p>
-            <p style="flex:1;">{{patient.past_history}}</p>
+            <div>药物过敏史：</div>
+            <div style="flex:1;">{{patient.past_history}}</div>
         </div>
         <div class="otherInfo">
-            <p>病历编号：</p>
-            <p style="flex:1;">{{patient.id}}</p>
+            <div>病历编号：</div>
+            <div style="flex:1;">{{patient.id}}</div>
         </div>
         <div style="page-break-after:always;margin-top:50px;"></div>
 
 
         <div class="printTitle">病历内容</div>
         <div class="recordTitle">
-            <p>科别：{{hispatient.departments}}</p>
-            <p>姓名：{{hispatient.name}}</p>
-            <p>性别：
+            <div>科别：{{hispatient.departments}}</div>
+            <div>姓名：{{hispatient.name}}</div>
+            <div>性别：
                 <span v-if="hispatient.gender == 1">男</span>
                 <span v-if="hispatient.gender == 2">女</span>
-            </p>
-            <p>年龄：{{hispatient.age}}岁</p>
+            </div>
+            <div>年龄：{{hispatient.age}}岁</div>
         </div>
         <div class="otherInfo">
-            <p class="otherName">主诉：</p>
-            <p style="flex:1;">{{history.chief_conplaint}}</p>
+            <div class="otherName">主诉：</div>
+            <div style="flex:1;">{{history.chief_conplaint}}</div>
         </div>
         <div class="otherInfo">
-            <p class="otherName">现病史：</p>
-            <p style="flex:1;">{{history.history_of_present_illness}}</p>
+            <div class="otherName">现病史：</div>
+            <div style="flex:1;">{{history.history_of_present_illness}}</div>
         </div>
         <div class="otherInfo">
-            <p class="otherName">既往史：</p>
-            <p style="flex:1;">{{history.past_history}}</p>
+            <div class="otherName">既往史：</div>
+            <div style="flex:1;">{{history.past_history}}</div>
         </div>
         <div class="otherInfo">
-            <p class="otherName">药物过敏史：</p>
-            <p style="flex:1;">{{history.past_history}}</p>
+            <div class="otherName">药物过敏史：</div>
+            <div style="flex:1;">{{history.past_history}}</div>
         </div>
         <div class="otherInfo">
-            <p class="otherName">个人史：</p>
-            <p style="flex:1;">{{history.personal_history}}</p>
+            <div class="otherName">个人史：</div>
+            <div style="flex:1;">{{history.personal_history}}</div>
         </div>
         <div class="otherInfo">
-            <p class="otherName">家族史：</p>
-            <p style="flex:1;">{{history.family_history}}</p>
+            <div class="otherName">家族史：</div>
+            <div style="flex:1;">{{history.family_history}}</div>
         </div>
         <div class="otherInfo">
-            <p class="otherName">体格检查：</p>
-            <p style="flex:1;">无</p>
+            <div class="otherName">体格检查：</div>
+            <div style="flex:1;">无</div>
         </div>
         <div class="otherInfo">
-            <p class="otherName">门诊诊断：</p>
-            <p style="flex:1;">{{history.diagnostic}}</p>
+            <div class="otherName">门诊诊断：</div>
+            <div style="flex:1;">{{history.diagnostic}}</div>
         </div>
         <div class="otherInfo">
-            <p class="otherName">门诊医嘱：</p>
-            <p style="flex:1;">{{history.doctor_advice}}</p>
+            <div class="otherName">门诊医嘱：</div>
+            <div style="flex:1;">{{history.doctor_advice}}</div>
         </div>
         <div style="margin-top:20px;text-align:right;">
             医生签名：{{getDoctor(history.doctor)}}
     line-height: 24px;
     padding:0 10px;
 }
-.infoTitle p{
+.infoTitle div{
     width: 200px;
 }
 .otherInfo{
     padding:0 10px;
     border-bottom: 2px solid #000;
 }
-.recordTitle p{
+.recordTitle div{
     width: 200px;
 }
 

src/xt_pages/outpatientDoctorStation/template/printOne.vue

             <p>年龄：{{patient.age}}岁</p>
         </div>
         <div class="infoMain">
-            <p style="margin-bottom: 10px;">门诊号：{{this.hisPatient.number?this.hisPatient.number:""}}</p>
-            <p style="margin-bottom: 10px;">科室：{{getDepart(this.hisPatient.departments?this.hisPatient.departments:"")}}</p>
-            <p style="margin-bottom: 10px;">医保卡号：{{this.hisPatient.number?this.hisPatient.number:""}}</p>
-            <p style="margin-bottom: 10px;">电话：{{patient.phone}}</p>
-            <p>地址：{{patient.home_address}}</p>
-            <p>临床诊断：{{patient.diagnose}}</p>
+            <div style="margin-bottom: 10px;">门诊号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
+            <div style="margin-bottom: 10px;">科室：{{getDepart(this.hisPatient.departments?this.hisPatient.departments:"")}}</div>
+            <div style="margin-bottom: 10px;">医保卡号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
+            <div style="margin-bottom: 10px;">电话：{{patient.phone}}</div>
+            <div>地址：{{patient.home_address}}</div>
+            <div style="display:flex;width:50%;">临床诊断：{{patient.diagnose}}</div>
         </div>
         <div class="prescriptionBox">
-            <p class="Rp">Rp:</p>
+            <div class="Rp">Rp:</div>
             <div class="drugsBox" v-for="(item,index) in advicePrint" :key="index">
-                <p class="drugsOne">{{item.advice_name?item.advice_name:""}}&nbsp;&nbsp;{{item.single_dose}}{{item.single_dose_unit}}&nbsp;×&nbsp; {{item.prescribing_number}}{{item.prescribing_number_unit}}</p>
-                <p style="margin-left:100px;"><span>用法：{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></p>
+                <div class="drugsOne">{{item.advice_name?item.advice_name:""}}&nbsp;&nbsp;{{item.single_dose}}{{item.single_dose_unit}}&nbsp;×&nbsp; {{item.prescribing_number}}{{item.prescribing_number_unit}}</div>
+                <div style="margin-left:100px;"><span>用法：{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></div>
             </div>
         </div>
         <div class="doctorBox">
     border-bottom: 2px solid #000;
     padding:0 10px;
 }
-.infoMain p{
+.infoMain div{
     width: 50%;
     line-height: 24px;
 }
 .prescriptionBox{
     padding:0 10px;
-    height:600px;
+    min-height:450px;
 }
 .Rp{
     font-size: 22px;
     padding-left: 40px;
     margin-bottom: 10px;
 }
-.drugsBox p{
-    line-height: 30px;
+.drugsBox div{
+    line-height: 20px;
 }
 .drugsOne{
     line-height: 24px;

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

             <p>年龄：{{patient.age}}岁</p>
         </div>
         <div class="infoMain">
-            <p style="margin-bottom: 10px;">门诊号：</p>
-            <p style="margin-bottom: 10px;">科室：</p>
-            <p style="margin-bottom: 10px;">医保卡号：</p>
-            <p style="margin-bottom: 10px;">电话：{{patient.phone}}</p>
-            <p>地址：{{patient.home_address}}</p>
-            <p>临床诊断：{{patient.diagnose}}</p>
+            <div style="margin-bottom: 10px;">门诊号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
+            <div style="margin-bottom: 10px;">科室：{{getDepart(this.hisPatient.departments?this.hisPatient.departments:"")}}</div>
+            <div style="margin-bottom: 10px;">医保卡号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
+            <div style="margin-bottom: 10px;">电话：{{patient.phone}}</div>
+            <div>地址：{{patient.home_address}}</div>
+            <div style="display:flex;width:50%;">临床诊断：{{patient.diagnose}}</div>
         </div>
         <div class="prescriptionBox">
-            <p class="Rp">Rp:</p>
+            <div class="Rp">Rp:</div>
             <div class="drugsBox" v-for="(item,index) in advicePrint" :key="index">
-                <p class="drugsOne">{{item.advice_name}}&nbsp;&nbsp;{{item.single_dose}}{{item.single_dose_unit}}&nbsp;×&nbsp; {{item.prescribing_number}}{{item.prescribing_number_unit}}</p>
-                <p style="margin-left:100px;"><span>用法：{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></p>
+                <div class="drugsOne">{{item.advice_name?item.advice_name:""}}&nbsp;&nbsp;{{item.single_dose}}{{item.single_dose_unit}}&nbsp;×&nbsp; {{item.prescribing_number}}{{item.prescribing_number_unit}}</div>
+                <div style="margin-left:100px;"><span>用法：{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></div>
             </div>
         </div>
         <div class="doctorBox">
-            <p>医师：{{getDoctor(advicePrint[0].advice_doctor)}}</p>
-            <p>日期：{{getTime(advicePrint[0].advice_date)}}</p>
+            <p>医师：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
+            <p>日期：{{getTime(advicePrint[0].advice_date)?getTime(advicePrint[0].advice_date):""}}</p>
         </div>
         <div class="actionBar">
-            <p>审核：{{getDoctor(advicePrint[0].advice_doctor)}}</p>
-            <p>配对：{{getDoctor(advicePrint[0].advice_doctor)}}</p>
-            <p>核对：{{getDoctor(advicePrint[0].checker)}}</p>
-            <p>发药：{{getDoctor(advicePrint[0].execution_staff)}}</p>
-            <p>药费：{{advicePrint[0].price}}</p>
+            <p>审核：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
+            <p>配对：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
+            <p>核对：{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
+            <p>发药：{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
+            <p>药费：{{advicePrint[0].price?advicePrint[0].price:""}}</p>
         </div>
     </div>
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
-  import {getAllDoctorList} from "@/api/project/project"
+import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
+import {getInitData} from "@/api/his/his"
 export default {
     props:{
-      patient:Object,
-      advicePrint:Array,
-      hisPatient:Object,
+      patient_id:Number,
+      record_date:String,
+      prescription_id:Number
     }, 
     data(){
-      return{
-        doctorList:[]
+      return {
+        doctorList:[],
+        advicePrint:{},
+        patient:{},
+        tableData:[],
+        prescriptionInfo:[],
+        hisPatient:{},
+        department:[]
       }
     },
    methods:{
         }
         return ''
      },
+       getPrescriptionPrint(){
+         var params = {
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          prescription_id:this.prescription_id,
+        }
+        console.log("params---",params)
+       getPrescriptionPrint(params).then(response=>{
+         if(response.data.state == 1){
+            var advicePrint =  response.data.data.advicePrint
+            console.log("adviceprint",advicePrint)
+            this.advicePrint = advicePrint
+            var patient =  response.data.data.patient
+            console.log("patient",patient)
+            this.patient = patient
+            var doctorPorject = response.data.data.doctorPorject
+          
+            var arr = doctorPorject.project
+              console.log("我的中谷歌",arr)
+            for(let i=0;i<arr.length;i++){
+              console.log("arr",arr[i].project_name)
+            }
+            this.tableData = arr
+            console.log("3333",this.tableData)
+            var prescriptioninfo = response.data.data.prescriptionInfo
+            console.log("prescriptioninfo",prescriptioninfo)
+            this.prescriptionInfo = prescriptioninfo
+          }
+       })
+     },
+     getHisPatientDetail(){
+          const params = {
+              patient_id:this.patient_id
+          }
+       getHisPatientDetail(params).then(response=>{
+          if(response.data.state == 1){
+             var hisPatient =  response.data.data.hisPatient
+             console.log("挂号病人",hisPatient)
+             this.hisPatient = hisPatient
+          }
+       })
+     },
+     getInitData(){
+       getInitData().then(response=>{
+          if(response.data.state == 1){
+            this.department = response.data.data.department
+           
+          }
+       })
+     },
+     getDepart(id){
+         var name = ""
+       for(let i=0;i<this.department.length;i++){
+           if(id == this.department[i].id){
+               name = this.department[i].name
+           }
+       }
+       return name
+     }
    },
    created(){
       this.getAllDoctorList()
+      this.getInitData()
+   },
+   watch:{
+     patient_id:function(val){
+       console.log("999999888888",this.patient_id,this.record_date,this.prescription_id)
+       this.getPrescriptionPrint()
+       this.getHisPatientDetail()
+     }
    }
 }
 </script>
     border-bottom: 2px solid #000;
     padding:0 10px;
 }
-.infoMain p{
+.infoMain div{
     width: 50%;
     line-height: 24px;
 }
 .prescriptionBox{
     padding:0 10px;
-    height:600px;
+    min-height:450px;
 }
 .Rp{
     font-size: 22px;
     padding-left: 40px;
     margin-bottom: 10px;
 }
-.drugsBox p{
-    line-height: 30px;
+.drugsBox div{
+    line-height: 20px;
 }
 .drugsOne{
     line-height: 24px;

src/xt_pages/outpatientDoctorStation/treatPrint.vue

       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 300px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain p{width: 50%;line-height: 1px;}.prescriptionBox{padding:0 10px;height:600px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 300px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain p{width: 50%;line-height: 1px;}.prescriptionBox{padding:0 10px;min-height:600px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
       printJS({
         printable: "prescription-print",
         type: "html",

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

 }
 .prescriptionBox{
     padding:0 10px;
-    height:600px;
+    min-height:600px;
 }
 .Rp{
     font-size: 22px;

src/xt_pages/outpatientRegistration/index.vue

             <div class="nameTitle">患者基本信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form"  :rules="rules"  ref="form"  label-width="100px">
-                    <el-form-item label="结算类型：">
-                        <el-select v-model="form.settlementValue" placeholder="请选择">
-                            <el-option
-                            v-for="item in settlement"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="specialFormItem" label="医保卡号：">
-                        <div style="display:flex;">
-                            <el-input v-model="form.medicalInsuranceCard"></el-input>
-                            <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
-                        </div>
-                    </el-form-item>
                     <el-form-item label="患者姓名："  prop="name" :validate-event="is_Name">
                         <!-- <el-input  v-model="form.name"></el-input> -->
                        <el-select v-model="form.name" placeholder="请选择">
                             </el-option>
                         </el-select>
                     </el-form-item>
+
                     <el-form-item label="性别：" prop="sex" :validate-event="is_Name">
                         <el-select v-model="form.sex" placeholder="请选择">
                             <el-option
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="证件类型：">
+
+                    <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
+                        <el-input v-model="form.age"></el-input>
+                    </el-form-item>
+
+
+                    <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
+                        <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期"></el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="手机号码" prop="phone">
+                        <el-input v-model="form.phone"></el-input>
+                    </el-form-item>
+
+
+                      <el-form-item label="医疗类别：">
+                        <el-select v-model="form.medicalCare" placeholder="请选择">
+                            <el-option
+                            v-for="item in medicalCare"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+
+                  <el-form-item label="证件类型：">
                         <el-select v-model="form.certificates" placeholder="请选择">
                             <el-option
                             v-for="item in certificates"
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="医疗类别：">
-                        <el-select v-model="form.medicalCare" placeholder="请选择">
+
+                   <el-form-item label="证件号码：" prop="idCard"  :validate-event="is_Name">
+                        <el-input v-model="form.idCard"></el-input>
+                    </el-form-item>
+
+
+                    <el-form-item label="结算类型：">
+                        <el-select v-model="form.settlementValue" placeholder="请选择">
                             <el-option
-                            v-for="item in medicalCare"
+                            v-for="item in settlement"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
-                        <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期"></el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
-                        <el-input v-model="form.age"></el-input>
+
+
+                   <el-form-item label="社保类型:">
+                        <el-select v-model="form.social_type" placeholder="请选择">
+                            <el-option
+                            v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
                     </el-form-item>
-                    <el-form-item label="证件号码：" prop="idCard"  :validate-event="is_Name">
-                        <el-input v-model="form.idCard"></el-input>
+                    <el-form-item class="specialFormItem" label="医保卡号：">
+                        <div style="display:flex;">
+                            <el-input v-model="form.medicalInsuranceCard"></el-input>
+                            <!-- <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button> -->
+                        </div>
                     </el-form-item>
 
                 </el-form>
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { basename } from 'path'
-import { getAllDoctorList,saveHisPatient } from "@/api/project/project"
+import { getAllDoctorList,saveHisPatient,getTodaySchedulePatient } from "@/api/project/project"
+import { getDictionaryDataConfig } from '@/utils/data'
 const moment = require('moment')
 export default {
     components:{
                 registrationFee:'',
                 medicalExpenses:'',
                 cost:'',
-                total: ''
+                total: '',
+                phone:'',
+                social_type:'',
             },
             settlement: [{
                 value: 1,
            show:false,
            is_Name:false,
            patient:[],
+           scialType:[]
         }
     },
     computed:{
              this.is_Name = true
              return
            }
-          
+
 
            if(this.form.sex == ""){
              this.$message.error("患者性别不能为空")
                     registrationFee:this.form.registrationFee,
                     medicalExpenses:this.form.medicalExpenses,
                     cost:this.form.cost,
-                    total:this.total
+                    total:this.total,
+                    phone:this.form.phone,
+                    social_type:this.form.social_type
                 }
                 console.log("params",params)
-                return
+
                 saveHisPatient(params).then(response=>{
                    if(response.data.state == 1){
                      var patient =  response.data.data.patient
                      this.form.registrationFee = "",
                      this.form.medicalExpenses = "",
                      this.form.cost="",
-                     this.form.total= ""
+                     this.form.total= "" ,
+                     this.form.phone = "",
+                     this.form.social_type = ""
                    }
                 })
              }
                this.patient = patient
              }
           })
-       }
+       },
+       getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+
+      },
     },
     created(){
       //获取当前机构有人员信息

src/xt_pages/role/components/AdminInfoForm.vue

         </el-select>
       </el-form-item>
 
+
+      <el-form-item label="科室:">
+         <el-select v-model="form.department_id" placeholder="科室">
+          <el-option
+            v-for="item in departMent"
+            :label="item.name"
+            :value="item.id"
+            :key="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="职位 : ">
         <el-input v-model="form.user_title_name" placeholder="输入职位"></el-input>
       </el-form-item>
 
+       
+
       <el-form-item label="介绍 : ">
         <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
       </el-form-item>
 <script>
   import Tinymce from '@/components/Tinymce'
   import { addAdmin, getAddAdminInitData, getModifyAdminInitData, modifyAdmin } from '@/api/role/admin'
-
+  import { getAllDePartmentList } from "@/api/project/project"
   export default {
     name: 'AdminInfoForm',
     components: {
           user_title: '',
           role: '', // 其实应该是 int 类型
           intro: '',
+          department:'',
+          department_id:"",
         },
+        departMent:[],
         rules: {
           mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
           name: [{ required: true, validator: checkName, trigger: 'blur' }],
                 }
                 this.form.user_title = admin.user_title
                 this.form.role = admin.role_ids
+                this.form.department_id = admin.department_id
                 this.form.role_ids = []
                 for (let i = 0; i < this.form.role.split(",").length; i++) {
                   if (this.form.role.split(',')[i].length > 0) {
 
         this.dialogFormVisible = true
       },
-      submitAction: function() {     
+      submitAction: function() {   
+       console.log("第是",this.form.department_id)  
+        var department = ""
+        for(let i=0;i<this.departMent.length;i++){
+          if(this.form.department_id == this.departMent[i].id){
+              department = this.departMent[i].name
+          }
+        }
+        this.form.department = department
+        
         if (this.admin_id < 0) {
           return
         }
             }
 
             this.loading = true
+            console.log("id-----",this.form.id)
             if (this.form.id === 0) {
               this.form.role = this.form.role_ids.join(',')
               addAdmin(
                 this.form.user_title,
                 this.form.role,
                 this.form.intro,
-                this.form.user_title_name
+                this.form.user_title_name,
+                this.form.department,
+                this.form.department_id,
               ).then(rs => {
                   this.loading = false
                   var resp = rs.data
                 })
             } else {
               this.form.role = this.form.role_ids.join(',')
-
-              modifyAdmin(
-                this.form.id,
-                this.form.name,
-                this.form.user_type,
-                this.form.user_title,
-                this.form.role,
-                this.form.intro,
-                this.form.user_title_name,
-              )
-                .then(rs => {
+             
+               var department = ""
+               for(let i=0;i<this.departMent.length;i++){
+                if(this.form.department_id == this.departMent[i].id){
+                    department = this.departMent[i].name
+                }
+              }
+              this.form.department = department
+           
+             
+              modifyAdmin(this.form.id,this.form.name,this.form.user_type,this.form.user_title,this.form.role,this.form.intro, this.form.user_title_name,this.form.sort,this.form.department,this.form.department_id).then(rs => {
                   this.loading = false
                   var resp = rs.data
                   if (resp.state === 1) {
             return false
           }
         })
+      },
+
+      getlist(){
+        getAllDePartmentList().then(response=>{
+         if(response.data.state == 1){
+           var department =   response.data.data.departMent
+           console.log("department2222",department)
+           this.departMent = department
+         
+         }
+        })
       }
+    },
+
+    created(){
+        //获取所有科室
+       this.getlist()
     }
   }
 </script>

src/xt_pages/role/components/AdminRoleInfoForm.vue

       <el-form-item label="职位 : ">
         <el-input v-model="form.user_title_name" placeholder="输入职位"></el-input>
       </el-form-item>
-
+      
       <el-form-item label="介绍 : ">
         <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
       </el-form-item>

src/xt_pages/role/components/EditAdminInfo.vue

                     this.form.user_title = admin.user_title
                     this.form.role = admin.role_id
                     this.form.intro = admin.intro
+                    this.form.deparment_id = admin.deparment_id
                 } else {
                     this.$message.error(resp.msg)
                 }