Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/his/his.js

 
 
 
+export function register(params) {
+  return request({
+    url: "/api/register/get",
+    method: "get",
+    params:params,
+  });
+}
 
+export function upload(params) {
+  return request({
+    url: "/api/upload/get",
+    method: "get",
+    params:params,
+  });
+}
 
 
-// export function createCaseHistory(params) {
-//   return request({
-//     url: "/api/doctorworkstation/casehistory/create",
-//     method: "post",
-//     params:params
-//   });
-// }
 
 
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

           <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-if="hisPatientInfo == null || hisPatientInfo.id == 0 " size="small" @click="open(6)" type="primary">挂号</el-button>
-          <el-button v-if="hisPatientInfo != null && hisPatientInfo.id > 0 " size="small" @click="open(4)" type="primary">收费</el-button>
-          <el-button size="small" v-if="state == '已收费'" @click="open(5)" 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">
           <div class="centerLeft">
   import prescriptionTable from './components/prescriptionTable'
   import additionalCharges from './components/additionalCharges'
   import { getPatientInformation, getPatientList } from '@/api/project/project'
-  import { getPatientInfo, getSchedulePatientList } from '@/api/his/his'
+  import { getPatientInfo, getSchedulePatientList, register,upload } from '@/api/his/his'
 
   const moment = require('moment')
   export default {
         record_date: '',
         tableData: [],
         editableTabsValue: '1',
+        loadingone:false,
         editableTabs: [{
           title: '处方1',
           name: '1'
         }],
         tabIndex: 1,
         hisPatientInfo: {},
-
+        loadingtwo:false,
         patientTableData: [{
           name: '杨美英',
           mdtrt_id: '1709946'
         }],
-        patientInfo: {},
+        patientInfo: { id: 0 },
         doctor: {},
         total: 0,
         state: '未收费',
       this.getPatientList()
     },
     methods: {
-      tabclickEvent(val){
-        for (let i= 0; i<this.prescriptions.length; i++){
-          if(this.prescriptions[i].name == val.name){
+      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])
+            var temp = this.deepClone(this.prescriptions[i])
             this.curPrescriptions = temp
             console.log(this.curPrescriptions)
           }
         }
-      },deepClone(source) {
+      }, deepClone(source) {
         if (!source && typeof source !== 'object') {
           throw new Error('error arguments', 'shallowClone')
         }
               total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
             }
           }
-          if(this.prescriptions[i].project != null) {
+          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
             }
         } 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
+
+            }
+          })
+
           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
+            }
+          })
+        }
       },
       addTab(targetName) {
         let newTabName = ++this.tabIndex + ''

src/xt_pages/outpatientCharges/summaryDetail.vue

             <div class="mainCenter">
                 <div class="centerLeft">
                     <div class="tabsBox">
-                        <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
+                        <!--<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-tab-pane
                                 v-for="(item, index) in editableTabs"
                                     </el-table-column>
                                     <el-table-column align="center" prop="name" width="50" label="组套">
                                         <template slot-scope="scope">
-                                            
+
                                         </template>
                                     </el-table-column>
                                     <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
                                         <template slot-scope="scope">
-                                            
+
                                         </template>
                                     </el-table-column>
                                     <el-table-column align="center" prop="name" width="50" label="用法">
                                         <template slot-scope="scope">
-                                            
+
                                         </template>
                                     </el-table-column>
                                     <el-table-column align="center" prop="name" width="50" label="频率">
                                         <template slot-scope="scope">
-                                            
+
                                         </template>
                                     </el-table-column>
                                     <el-table-column align="center" prop="name" width="50" label="天数">
                                         <template slot-scope="scope">
-                                            
+
                                         </template>
                                     </el-table-column>
                                     <el-table-column align="center" prop="name" width="100" label="总量">
                                         <template slot-scope="scope">
-                                            
+
                                         </template>
                                     </el-table-column>
                                     <el-table-column align="center" prop="name" width="50" label="单价">
                                         <template slot-scope="scope">
-                                            
+
                                         </template>
                                     </el-table-column>
                                     <el-table-column align="center" prop="name" width="50" label="备注">
                                         <template slot-scope="scope">
-                                            
+
                                         </template>
                                     </el-table-column>
                                 </el-table>
                             </el-tab-pane>
                         </el-tabs>
-                        
+
                     </div>
                     <div class="costBox">
                         <span>处方编号：2134348971237883</span>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

         </el-form>
         <div class="tabsBox">
 
-          <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
+          <!--<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" @tab-click="tabclickEvent">
             <el-tab-pane