Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/his/his.js

 }
 
 
+export function delHisPrescription(params) {
+  return request({
+    url: "/api/hisprescription/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+export function delHisAdvice(params) {
+  return request({
+    url: "/api/advice/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+export function delHisProject(params) {
+  return request({
+    url: "/api/project/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+
+
+
+
 
 
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

         </div>
         <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
             <div class="mainLeft">
-                <div class="mainCell" style="justify-content: space-between;">
-                    <p>未就诊：<span>1</span>人</p>
-                    <p>已就诊：<span>0</span>人</p>
-                </div>
-                <div class="mainCell">
-                    <el-radio-group v-model="radio" @change="changeRadio">
-                        <el-radio :label=1>未就诊</el-radio>
-                        <el-radio :label=2>已就诊</el-radio>
-                        <el-radio :label=3>全部</el-radio>
-                    </el-radio-group>
-                </div>
+                <!--<div class="mainCell" style="justify-content: space-between;">-->
+                    <!--<p>未就诊：<span>1</span>人</p>-->
+                    <!--<p>已就诊：<span>0</span>人</p>-->
+                <!--</div>-->
+                <!--<div class="mainCell">-->
+                    <!--<el-radio-group v-model="radio" @change="changeRadio">-->
+                        <!--<el-radio :label=1>未就诊</el-radio>-->
+                        <!--<el-radio :label=2>已就诊</el-radio>-->
+                        <!--<el-radio :label=3>全部</el-radio>-->
+                    <!--</el-radio-group>-->
+                <!--</div>-->
                 <div class="mainCell" style="margin-bottom:10px;">
                     <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
                     <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
                 </div>
-                <div style="flex:1;overflow-y:auto;">
-                    <el-table :data="tableData" border  style="width: 100%;" :row-style="{ color: '#303133' }" 
-                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
-                    highlight-current-row ref="tab"
-                    @current-change="handleCurrentChange">
-                        <el-table-column align="center" prop="name" label="患者姓名">
-                            <template slot-scope="scope">{{ scope.row.name }}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="name" label="就诊号" width="90">
-                            <template slot-scope="scope">3222</template>
-                        </el-table-column>
-                    </el-table>
-                </div>
+              <div style="flex:1;overflow-y:auto;">
+                <el-table :data="patientTableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                          highlight-current-row ref="tab"
+                          @current-change="handleCurrentChange">
+                  <el-table-column align="center" prop="name" label="患者姓名">
+                    <template slot-scope="scope">{{ scope.row.patients.name }}</template>
+                  </el-table-column>
+                  <el-table-column align="center" prop="name" label="就诊号" width="90">
+                    <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+                  </el-table-column>
+                </el-table>
+              </div>
             </div>
             <div class="mainRight">
-                 
-                <div class="mainCell" style="position: absolute;right: 30px;z-index:9;">
-                    <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
-                    <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button>
-                    <el-button size="small" @click="open(3)" type="primary">打印</el-button>
-                    <el-button size="small" @click="open(4)" type="primary">收费</el-button>
-                    <el-button size="small" v-if="state == '已收费'" @click="open(5)" type="primary">退费</el-button>
-                </div>
+
+              <div class="mainCell" style="margin-bottom:10px;flex-direction: row-reverse;">
+                <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
+                <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button>
+                <el-button size="small" @click="open(3)" type="primary">打印</el-button>
+                <el-button v-loading="loadingone" v-if="hisPatientInfo == null || hisPatientInfo.id == 0 " size="small" @click="open(6)"
+                           type="primary">挂号
+                </el-button>
+                <el-button v-loading="loadingtwo" v-if="hisPatientInfo != null && hisPatientInfo.id > 0 " size="small" @click="open(4)"
+                           type="primary">收费
+                </el-button>
+                <el-button size="small" @click="open(5)" type="primary">退费</el-button>
+              </div>
+
                 <div class="mainCenter">
                     <el-tabs class="settlementTabs" v-model="activeName" @tab-click="handleClick">
                         <el-tab-pane label="日结" name="first">
                             <div style="display:flex;height:100%;">
                                 <div class="centerLeft">
                                     <div class="tabsBox">
-                                        <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
-                                        <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab" :before-leave="moreState">
+                                        <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
+                                        <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable >
                                             <el-tab-pane
-                                                v-for="(item, index) in editableTabs"
+                                                v-for="(item, index) in prescriptions"
                                                 :key="index"
                                                 :label="item.title"
                                                 :name="item.name"
                                                     placeholder="选择日期">
                                                     </el-date-picker>
                                                 </div>
-                                                <prescription-table :preTableData='preTableData'></prescription-table>
                                             </el-tab-pane>
-                                            <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span></el-tab-pane>
+                                          <prescription-table ref="prescription_tables" :prescription="curPrescriptions"></prescription-table>
                                         </el-tabs>
-                                        
+
                                     </div>
                                     <div class="costBox">
-                                        <span>处方编号：2134348971237883</span>
-                                        <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>
-                                        <span>{{ state }}</span>
+                                      <span>当前处方总费用：<span style="color:red;">{{ getTotal() }}元</span></span>
+                                      <span>{{ state }}</span>
                                     </div>
                                 </div>
                                 <div class="centerRight">
                                     <p class="centerRightTitle">人员信息</p>
                                     <div style="display:flex;justify-content: space-between;line-height:30px;">
                                         <span style="font-size:14px;">人员编码:</span>
-                                        <span style="font-size:14px;">日期:{{start_time}}</span>
+                                        <span style="font-size:14px;">日期:{{record_date}}</span>
                                     </div>
                                     <ul class="basicUl">
-                                        <li style="width:50%;">姓名：{{ patientInfo.name }}</li>
-                                        <li style="width:50%;">性别：{{ patientInfo && patientInfo.gend == 1 ? '男' : "女" }}</li>
-                                        <li style="width:50%;">年龄：{{ patientInfo.age }}</li>
-                                        <li style="width:50%;">身高：</li>
-                                        <li style="width:50%;">体重：</li>
-                                        <li style="width:50%;">电话：</li>
-                                        <li style="width:100%;">地址：</li>
+                                      <li style="width:50%;">姓名：{{patientInfo.name}}</li>
+                                      <li style="width:50%;">性别：{{patientInfo.gender == 1 ? '男' : '女' }}</li>
+                                      <li style="width:50%;">年龄：{{patientInfo.age }}</li>
+                                      <li style="width:50%;">身高：{{patientInfo.height}}</li>
+                                      <li style="width:50%;">体重：{{patientInfo.weight}}</li>
+                                      <li style="width:50%;">电话：{{patientInfo.phone}}</li>
+                                      <li style="width:100%;">地址：{{patientInfo.home_address}}</li>
                                         <li style="width:100%;">过敏史：</li>
                                     </ul>
                                     <p class="centerRightTitle">诊断信息</p>
                             <div style="display:flex;height:100%;">
                                 <div class="centerLeft">
                                     <div class="tabsBox">
-                                        <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
-                                        <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab" :before-leave="moreState">
+                                        <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
+                                        <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable>
                                             <el-tab-pane
                                                 v-for="(item, index) in editableTabs"
                                                 :key="index"
                                                     range-separator="至"
                                                     start-placeholder="开始日期"
                                                     end-placeholder="结束日期">
-                                                    </el-date-picker> 
+                                                    </el-date-picker>
                                                 </div>
                                                 <prescription-table :preTableData='preTableData'></prescription-table>
                                             </el-tab-pane>
-                                            <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span></el-tab-pane>
+                                            <!--<el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span></el-tab-pane>-->
                                         </el-tabs>
-                                        
+
                                     </div>
                                     <div class="costBox">
                                         <span>处方编号：2134348971237883</span>
                             </div>
                         </el-tab-pane>
                     </el-tabs>
-                    
-                    
+
+
                 </div>
             </div>
         </div>
-        <additionalCharges ref='additionalCharges'></additionalCharges>
+        <!--<additionalCharges ref='additionalCharges'></additionalCharges>-->
     </div>
 </template>
 
 import prescriptionTable from './components/prescriptionTable'
 import additionalCharges from './components/additionalCharges'
 import { getPatientList,getPatientInformation } from "@/api/project/project"
+import { getPatientInfo, getSchedulePatientList, register,upload } from '@/api/his/his'
+
 const moment = require('moment')
 export default {
     components:{
     },
     data(){
         return{
-            crumbs: [
-                { path: false, name: '门诊收费' },
-                { path: false, name: '门诊收费管理' }
-            ],
-            tableData: [],
-            activeName:'first',
-            editableTabsValue: '1',
-            editableTabs: [{
+          crumbs: [
+            { path: false, name: '门诊收费' },
+            { path: false, name: '门诊收费管理' }
+          ],
+          activeName:"",
+          curPrescriptions: {},
+          prescriptions: [],
+          record_date: '',
+          tableData: [],
+          editableTabsValue: '1',
+          loadingone:false,
+          editableTabs: [{
             title: '处方1',
-            name: '1',
-            }],
-            tabIndex: 1,
-
-            patientTableData:[{
-                name:'杨美英',
-                mdtrt_id:"1709946",
-            }],
-            patientInfo:{},
-            doctor:{},
-            total:0,
-            state:'未收费',
-            radio:1,
-            radioStatus:1,
-            search_input:"",
-            start_time:moment().locale('zh-cn').format('YYYY-MM-DD')
+            name: '1'
+          }],
+          tabIndex: 1,
+          hisPatientInfo: {},
+          loadingtwo:false,
+          patientTableData: [{
+            name: '杨美英',
+            mdtrt_id: '1709946'
+          }],
+          patientInfo: { id: 0 },
+          doctor: {},
+          total: 0,
+          state: '未收费',
+          radio: 1,
+          radioStatus: 1,
+          search_input: '',
+          start_time: moment().locale('zh-cn').format('YYYY-MM-DD')
         }
     },
     created(){
-       
-       //获取患者信息
-       this.getPatientList()
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      this.record_date =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+
+      //获取患者信息
+      this.getPatientList()
     },
     methods:{
+      handleClick(){
+
+      },
+      searchAction(){
+
+
+      },
+      tabclickEvent(val) {
+        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
+            console.log(this.curPrescriptions)
+          }
+        }
+      }, deepClone(source) {
+        if (!source && typeof source !== 'object') {
+          throw new Error('error arguments', 'shallowClone')
+        }
+        const targetObj = source.constructor === Array ? [] : {}
+        Object.keys(source).forEach((keys) => {
+          if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = this.deepClone(source[keys])
+          } else {
+            targetObj[keys] = source[keys]
+          }
+        })
+        return targetObj
+      },
+      getTotal() {
+        var total = 0
+        console.log(this.prescriptions)
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if (this.prescriptions[i].advices != null) {
+            for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+              total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
+            }
+          }
+          if (this.prescriptions[i].project != null) {
+            for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+              total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].count
+            }
+          }
+        }
+        return total
+      },
         moreState(tab, event){
           if(tab == 'more'){
             return false;
           }
         },
-        open(index){
-            if(index == 1){
-            }else if(index == 2){
-                this.$router.push('/outpatientCharges/print')
-            }else if(index == 3){
-                this.$router.push('/outpatientCharges/treatPrint')
-            }else if(index == 4){
-                this.state = '已收费'
-                this.$message({message: '收费成功',type: 'success'});
-            }else if(index == 5){
-                this.$message({message: '退费成功',type: 'success'});
+      open(index) {
+        if (index == 1) {
+        } else if (index == 2) {
+
+        } else if (index == 4) {
+
+          let params = {
+            'id': this.patientInfo.id,
+            'record_time': this.record_date
+          }
+          this.loadingtwo = true
+          upload(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              this.loadingtwo = false
+
+              return false
+
+            } else {
+              this.loadingtwo = false
+
             }
-            
-        },
-        addTab(targetName) {
-            let newTabName = ++this.tabIndex + '';
-            this.editableTabs.push({
-                title: '处方' + this.tabIndex,
-                name: newTabName,
-            });
-            this.editableTabsValue = newTabName;
-        },
-        removeTab(targetName) {
-            let tabs = this.editableTabs;
-            let activeName = this.editableTabsValue;
-            if (activeName === targetName) {
-            tabs.forEach((tab, index) => {
-                if (tab.name === targetName) {
-                let nextTab = tabs[index + 1] || tabs[index - 1];
-                if (nextTab) {
-                    activeName = nextTab.name;
-                }
-                }
-            });
+          })
+
+          this.state = '已收费'
+          this.$message({ message: '收费成功', type: 'success' })
+        } else if (index == 5) {
+          this.$message({ message: '退费成功', type: 'success' })
+        } else if (index == 6) {
+
+          if (this.patientInfo.id == 0) {
+            this.$message.error('请先选择要挂号的病人')
+            return
+          }
+          let params = {
+            'id': this.patientInfo.id,
+            'record_time': this.record_date
+          }
+          this.loadingone = true
+          register(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              this.loadingone = false
+
+              return false
+
+            } else {
+              this.loadingone = false
+              var his_info = response.data.data.his_info
+              this.hisPatientInfo = his_info
             }
-            
-            this.editableTabsValue = activeName;
-            this.editableTabs = tabs.filter(tab => tab.name !== targetName);
-        },
-        addCharges(){
-            this.$refs.additionalCharges.show()
-        },
+          })
+        }
+      },
+
+        // addCharges(){
+        //     this.$refs.additionalCharges.show()
+        // },
         choosePatient(){
-            let a = JSON.parse(localStorage.getItem("drugs"))
-            this.preTableData = a
-            this.preTableData.map(item => {
-                this.total += item.unitPrice
-            })
-            // this.patientInfo = {
-            //     certno:"440221195903290027",
-            //     psn_no:"0221201972",
-            //     gend:"2",
-            //     brdy:"1960-03-29",
-            //     naty:"01",
-            //     psn_cert_type:"01",
-            //     psn_name:"杨美英",
-            //     age:60.7
-            // }
-            // this.doctor = {
-            //     name:'刘志刚',
-            //     department:'血透中心',
-            //     total:20,
-            // }
+          console.log(id)
+          this.radioStatus = id
+          this.getPatientList()
         },
-       changeRadio(id){ 
+       changeRadio(id){
          console.log(id)
          this.radioStatus = id
          this.getPatientList()
 
         //患者列表
         getPatientList(){
-           getPatientList().then(response=>{
-               if(response.data.state == 1){
-                 var hisPatient = response.data.data.hisPatient
-                 console.log("his",hisPatient)
-                 var scheduleList = response.data.data.scheduleList
-                 hisPatient.push(...scheduleList)
-                 console.log("arrr",hisPatient)
-                 var tabArr = this.unique(hisPatient)
-                 console.log("22222",tabArr)
-                 if(this.radioStatus == 1){
-                    this.tableData = tabArr
-                    this.$refs.tab.setCurrentRow(this.tableData[0])
-                 }
-                 if(this.radioStatus == 2){
-                    var prescription = response.data.data.prescription
-                    this.tableData = prescription
-                    this.$refs.tab.setCurrentRow(this.tableData[0])
-                 }
-                
-               }  
-           })
+          let params = {
+            'record_date': this.record_date
+          }
+          getSchedulePatientList(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.patientTableData = []
+              for (let i = 0; i < response.data.data.list.length; i++) {
+
+                if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                  this.patientTableData.push(response.data.data.list[i])
+                }
+              }
+            }
+          })
         },
 
         unique(arr) {
         },
         handleCurrentChange(val){
           console.log("val",val)
-          this.getPatientInformation(val.id)
+          this.getPatientInformation(val.patients.id)
         },
-        
+
         //获取患者的基本信息
-        getPatientInformation(id){
-            console.log(id)
-            getPatientInformation(id).then(response=>{
-               if(response.data.state == 1){
-                  var information = response.data.data.information
-                  console.log("information",information)
-                  this.patientInfo = information
-               }
-            })
+      getPatientInformation(id) {
+        let params = {
+          'record_date': this.record_date,
+          'patient_id': id
         }
+        getPatientInfo(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.patientInfo = response.data.data.xt_info
+            this.hisPatientInfo = response.data.data.his_info
+            this.prescriptions = []
+            for (let i = 0; i < response.data.data.prescription.length; i++) {
+              var prescription = response.data.data.prescription[i]
+              let index = i + 1
+              let obj = {
+                name: '处方' + index,
+                advices: prescription.advices,
+                project: prescription.project,
+                type: response.data.data.prescription[i].type
+              }
+              this.prescriptions.push(obj)
+              this.curPrescriptions = this.prescriptions[0]
+
+            }
+            // this.$refs.prescriptions.setData(this.prescriptions)
+          }
+        })
+      }
     }
 }
 </script>
         .el-radio{
             margin-right:5px;
         }
-        
+
     }
     .mainCell{
         height:36px;

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

             </el-option>
           </el-select>
           <span>总计：</span>
-          <span style="color:red;">{{ total }}</span>元
+          <span style="color:red;">{{ getTotal() }}</span>元
         </div>
       </div>
       <div class='centerRight'>
           <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 :data="tabProject" border @select='selectChange' style="width: 100%;"
+                <el-table ref="tables" :data="tabProject" border @select='selectChange' style="width: 100%;"
                           :row-style="{ color: '#303133' }"
                           @select-all="changeAllGoodInfoTableDataTwo"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
 
 
 <script>
-  import { createHisPrescription, getInitData, getPatientInfo, getSchedulePatientList } from '@/api/his/his'
+  import {
+    createHisPrescription,
+    delHisPrescription,
+    getInitData,
+    getPatientInfo,
+    getSchedulePatientList
+  } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import prescriptionTable from './prescriptionTable'
   import selectTemplate from './selectTemplate'
       hisPatientInfo: Object,
       prescriptions: Array,
       record_date: String,
-      other_sick:Array,
-      diagnoses:Array,
+      other_sick: {
+        type: Array,
+        default: []
+      },
+      diagnoses: {
+        type: Array,
+        default: []
+      }
     },
     components: {
       selectTemplate,
         tabPrjectTeam: [],
         teamList: [],
         doctors: [],
-        departMent: []
+        departMent: [],
+        curStatus: 0
       }
     }, mounted() {
 
     },
     methods: {
+      getTotal() {
+        var total = 0
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if (this.prescriptions[i].advices != null) {
+            for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+              total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
+            }
+          }
+          if (this.prescriptions[i].project != null) {
+            for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+              total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].count
+            }
+          }
+        }
+        return total
+      },
       createFilter(queryString) {
         return (restaurant) => {
           return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
 
       querySearch(queryString, cb) {
         var restaurants = this.diagnoses
-        console.log(restaurants)
         restaurants.map(item => {
           item.value = item.name
         })
         // 调用 callback 返回建议列表的数据
         cb(results)
       },
+
       querySearch2(queryString, cb) {
         var restaurants = this.other_sick
         restaurants.map(item => {
         }
       },
       getDictionaryDataConfig(module, filed_name) {
-        console.log(getDictionaryDataConfig(module, filed_name))
         return getDictionaryDataConfig(module, filed_name)
 
       },
             //用来区分处方属于项目还是药品
             if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
               this.customTabIndex = 1
+              this.curStatus = 1
             }
             if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
 
               this.customTabIndex = 2
+              this.curStatus = 2
             }
 
             if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
           }
 
         }
+      }, clearData() {
+
+        this.curPrescriptions = []
       },
       setData(data) {
         this.prescriptions = data
           let data = {
             'prescriptions': this.prescriptions
           }
-          console.log('data', data)
-          console.log('params', params)
           createHisPrescription(data, params).then(response => {
             if (response.data.state == 1) {
               this.prescriptions = []
               this.$message.success('保存成功')
             }
           })
-          localStorage.setItem('drugs', JSON.stringify(this.preDrugs))
-          // this.$message({ message: '保存成功', type: 'success' })
         } else if (index == 2) {
           this.$router.push('/outpatientDoctorStation/print')
         } else if (index == 4) {
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
         this.prescriptions.push({
+          id: 0,
           name: newTabName,
           advices: [],
           project: []
         })
         this.editableTabsValue = newTabName
         this.curPrescriptions = this.prescriptions[this.prescriptions.length - 1]
+        this.curStatus = 0
       },
       removeTab(targetName) {
+        let id = 0
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if (this.prescriptions[i].name == targetName) {
+            id = this.prescriptions[i].id
+          }
+        }
+
+        if (id == 0) {
+          let tabs = this.prescriptions
+          let activeName = this.editableTabsValue
+          if (activeName === targetName) {
+            tabs.forEach((tab, index) => {
+              if (tab.name === targetName) {
+                let nextTab = tabs[index + 1] || tabs[index - 1]
+                if (nextTab) {
+                  activeName = nextTab.name
+
+                }
+              }
+            })
+          }
+          this.editableTabsValue = activeName
+          this.prescriptions = tabs.filter(tab => tab.name !== targetName)
 
-        let tabs = this.prescriptions
-        let activeName = this.editableTabsValue
-        if (activeName === targetName) {
-          tabs.forEach((tab, index) => {
-            if (tab.name === targetName) {
-              let nextTab = tabs[index + 1] || tabs[index - 1]
-              if (nextTab) {
-                activeName = nextTab.name
+          for (let i = 0; i < this.prescriptions.length; i++) {
+            if (activeName == this.prescriptions[i].name) {
+              this.curPrescriptions = this.prescriptions[i]
+              if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
+                this.curStatus = 1
               }
+              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
+                this.curStatus = 2
+              }
+            }
+          }
+          if (this.prescriptions.length == 0) {
+            this.curPrescriptions = []
+            this.curStatus = 0
+          }
+        } else {
+          let params = {
+            'id': id
+          }
+          delHisPrescription(params).then(response => {
+            if (response.data.state == 1) {
+              this.$message.success('删除成功')
+            } else {
+              this.$message.success(response.data.msg)
             }
           })
         }
-
-        this.editableTabsValue = activeName
-        this.prescriptions = tabs.filter(tab => tab.name !== targetName)
-        console.log(this.prescriptions)
       },
       clickTab(index) {
         if (index == 1) {
         this.curDrugs = selection
       },
       comfirm() {
-        this.preDrugs = this.curDrugs
-        console.log(this.prescriptions)
+        console.log(this.curStatus)
+        console.log(this.rightTab)
+        console.log(this.curPrescriptions)
+
+
+        if (this.curStatus == 1  && this.rightTab == 2) {
+          this.$message.error('改处方是药品，无法添加项目')
+          this.teamList = []
+          this.$refs.tables.clearSelection()
+          return
+        }
+
+        if (this.curStatus ==2 && this.rightTab == 1) {
+          this.$message.error('改处方是项目，无法添加药品')
+          this.curDrugs = []
+          this.$refs.multipleTable.clearSelection()
+          return
+        }
+
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == this.editableTabsValue) {
-            var temp = this.deepClone(this.preDrugs)
+            var temp = this.deepClone(this.curDrugs)
             var temp2 = this.deepClone(this.teamList)
-            console.log(this.prescriptions[i].advices)
-            console.log(this.prescriptions[i].project)
-
-            console.log(temp)
-            console.log(temp2)
 
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
-                this.prescriptions[i].advices.push(temp[b])
+                let obj = {
+                  advice_id: 0,
+                  drug_name: temp[b].drug_name,
+                  single_dose: temp[b].single_dose,
+                  delivery_way: temp[b].delivery_way,
+                  execution_frequency: temp[b].execution_frequency,
+                  retail_price: temp[b].retail_price.toString(),
+                  remark: '',
+                  prescribing_number: temp[b].prescribing_number,
+                  single_dose_unit: temp[b].min_unit,
+                  prescribing_number_unit: temp[b].min_unit,
+                  min_unit: temp[b].min_unit
+
+                }
+                this.prescriptions[i].advices.push(obj)
               }
+              this.curStatus = 1
             }
+
             if (temp2.length > 0) {
               for (let b = 0; b < temp2.length; b++) {
-                this.prescriptions[i].project.concat(temp2[b])
+                this.prescriptions[i].project.push(temp2[b])
               }
+              this.curStatus = 2
             }
             this.curPrescriptions = this.prescriptions[i]
             this.$refs.multipleTable.clearSelection()
-            // this.$refs.prescription_tables.setNewData(this.prescriptions[i])
+            this.$refs.tables.clearSelection()
+
           }
         }
+        this.curDrugs = []
+        this.preDrugs = []
+        this.teamList = []
+
       }, changeAllGoodInfoTableDataTwo(row) {
         this.teamList = row
       },
             this.tabProject = project
           }
         })
-      },
-      querySearch() {
-
       }, deepClone(source) {
         if (!source && typeof source !== 'object') {
           throw new Error('error arguments', 'shallowClone')
       //获取所以项目组套
       this.getAllProjectTeam()
 
-
     }
   }
 </script>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="频率">
         <template slot-scope="scope">
-          <el-select v-model="scope.row.execution_frequency" placeholder="请选择">
+          <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
             <el-option
-              v-for="item in efs"
+              v-for="item,index in efs"
               :key="index"
               :label="item.name"
               :value="item.name">
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">
         <template slot-scope="scope">
-          <i class="el-icon-delete" @click="deleteDrug(scope.row)"></i>
+          <i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>
         </template>
       </el-table-column>
     </el-table>
 
 <script>
   import { getDictionaryDataConfig} from "@/utils/data";
-  import { getInitData } from '@/api/his/his'
+  import { getInitData,delHisAdvice,delHisProject } from '@/api/his/his'
 
   export default {
     props: {
           }
         })
 
-      },deleteDrug:function(row){
-        for (let i = 0; i < this.prescription.advices.length; i++){
-          if(this.prescription.advices[i].id == row.id){
-              this.prescription.advices.splice(i, 1)
+      },deleteDrug:function(index, row){
+        console.log(row)
+       console.log(index)
+
+       if(row.advice_id == 0){
+          this.prescription.advices.splice(index, 1)
+        }else{
+          let params = {
+            'id': row.advice_id,
           }
+          delHisAdvice(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              var temp2 = this.deepClone(this.prescription.advices)
+              temp2.splice(index, 1)
+              this.prescription.advices = temp2
+              this.$message.success(response.data.data.msg)
+            }
+          })
+
+
         }
-      },
+
+      },deepClone(source) {
+       if (!source && typeof source !== 'object') {
+         throw new Error('error arguments', 'shallowClone')
+       }
+       const targetObj = source.constructor === Array ? [] : {}
+       Object.keys(source).forEach((keys) => {
+         if (source[keys] && typeof source[keys] === 'object') {
+           targetObj[keys] = this.deepClone(source[keys])
+         } else {
+           targetObj[keys] = source[keys]
+         }
+       })
+       return targetObj
+     },
 
       setNewData:function(data){
+        this.prescription = data
 
         // this.prescription.advices = data.advices
       },
          return name
       },
       deleteProject(row){
+        if(row.id == 0){
+          this.prescription.project.splice(i, 1)
 
-        for (let i = 0; i < this.prescription.project.length; i++){
-          if(this.prescription.project[i].id == row.id){
-              this.prescription.project.splice(i, 1)
+        }else{
+          let params = {
+            'id': row.id,
           }
+          delHisProject(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              for (let i = 0; i < this.prescription.project.length; i++){
+                if(this.prescription.project[i].id == row.id){
+                  this.prescription.project.splice(i, 1)
+                }
+              }
+              this.$message.error(response.data.data.msg)
+            }
+          })
+
+
         }
+
       },
     },mounted(){
       this.getInitData()
     },
-    watch:{
-      prescription:function(){
-        console.log("8888888",this)
-        console.log("9999999",this.prescription)
-      }
-    }
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

           <el-table :data="patientTableData" @row-click='choosePatient' border style="width: 100%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                     highlight-current-row
+                    highlight-current-row
                     ref="tab"
-                   >
+          >
             <el-table-column align="center" prop="name" label="患者姓名">
-              <template slot-scope="scope">{{ scope.row.patients.name }}</template>
+              <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="就诊号" width="90">
-              <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+              <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
             </el-table-column>
           </el-table>
         </div>
           </el-radio-group>
         </div>
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
-                   <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
-        <desk-prescription :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date" ref="prescriptions"  :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"
+        <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
+        <desk-prescription :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
+                           ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
+                           :hisPatientInfo="hisPatientInfo"
                            v-if="titleType == '处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
                      :hisPatientInfo="hisPatientInfo" v-if="titleType == '病历'"></desk-record>
         patientInfo: {},
         hisPatientInfo: {},
         case_history: {},
-        patient_id:0,
-        diagnoses:[],
-        other_sick:[],
+        patient_id: 0,
+        diagnoses: [],
+        other_sick: []
 
       }
     },
             return false
           } else {
             this.patientTableData = response.data.data.list
-            console.log("222",this.patientTableData)
+            console.log('222', this.patientTableData)
             // this.$refs.tab.setCurrentRow(this.patientTableData[0])
             let cal_one = 0
             let cal_two = 0
                 cal_two = cal_two + 1
               }
             }
-
+            this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            console.log(this.patientTableData[0])
+            this.choosePatient(this.patientTableData[0])
             this.cal_one = cal_one
             this.cal_two = cal_two
           }
           'record_date': this.record_date,
           'patient_id': val.patients.id
         }
+        console.log("-------")
         getPatientInfo(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
+            console.log("999888811111")
+
+            this.prescriptions = []
+            this.$refs.prescriptions.clearData()
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
             } else {
               this.case_history.is_infect = false
             }
-            this.prescriptions = []
             if (response.data.data.prescription.length > 0) {
               for (let i = 0; i < response.data.data.prescription.length; i++) {
                 var prescription = response.data.data.prescription[i]
+                let tempAdvice = []
+                for (let b = 0; b < prescription.advices.length; b++) {
+                  let obj = {
+                    advice_id: prescription.advices[b].id,
+                    drug_name: prescription.advices[b].advice_name,
+                    single_dose: prescription.advices[b].single_dose,
+                    delivery_way: prescription.advices[b].delivery_way,
+                    execution_frequency: prescription.advices[b].execution_frequency,
+                    retail_price: prescription.advices[b].price.toString(),
+                    remark: prescription.advices[b].remark,
+                    prescribing_number:prescription.advices[b].prescribing_number,
+                    single_dose_unit:prescription.advices[b].single_dose_unit,
+                    prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
+                    min_unit:prescription.advices[b].single_dose_unit
+
+                  }
+                  tempAdvice.push(obj)
+                }
                 let index = i + 1
                 let obj = {
-                  name: "处方" + index,
-                  advices: prescription.advices,
-                  project: prescription.project,
+                  id: prescription.id,
+                  name: '处方' + index,
+                  advices: tempAdvice,
+                  project: prescription.project
                 }
                 this.prescriptions.push(obj)
               }
-            }else{
+            } else {
               let obj = {
-                name: "处方" + 1,
+                id:0,
+                name: '处方' + 1,
                 advices: [],
-                project: [],
+                project: []
               }
               this.prescriptions.push(obj)
             }
         //     psn_name:"杨美英",
         //     age:60.7
         // }
-      },
+      }
       // changePatient(val){
       //   console.log("患者val",val)
       //   this.hisPatientInfo = val.hisPatientInfo
 
       this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
       this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
-      console.log(this.diagnoses)
-      console.log(this.other_sick)
 
-      console.log("111122222")
 
 
     }