Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/his/his.js

@@ -34,13 +34,13 @@ export function createCaseHistory(params) {
 
 
 
-// export function createCaseHistory(params) {
-//   return request({
-//     url: "/api/doctorworkstation/casehistory/create",
-//     method: "post",
-//     params:params
-//   });
-// }
+export function getInitData(params) {
+  return request({
+    url: "/api/hisprescription/config",
+    method: "get",
+    params:params
+  });
+}
 
 
 // export function createCaseHistory(params) {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -1,16 +1,18 @@
 <template>
   <div class="prescriptionTable">
-    <el-table v-if="activeType  == '1'" :data="prescription.advice" border style="width: 98%;" :row-style="{ color: '#303133' }"
+    <div>{{prescription.name}}</div>
+    <el-table v-if="activeType  == '1'" :data="prescription.advices" border style="width: 98%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" type="selection" width="40"></el-table-column>
       <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="name" label="名称">
-        <template slot-scope="scope">{{ scope.row.name }}</template>
+        <template slot-scope="scope">{{ scope.row.drug_name }}</template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
         <template slot-scope="scope">
-          <el-input v-model="input" placeholder=""></el-input>
+          <!--<el-input v-model="input" placeholder=""></el-input>-->
+          <!--<el-input  v-model="scope.row.single_dose"></el-input>-->
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="用法">
@@ -189,10 +191,21 @@
     props: {
       preDrugs: Array,
       activeType: String,
-      prescription:Object,
+      prescription:{
+        type:Object,
+        default: function () {
+          return {
+            name:"",
+            advices:[],
+            projects:[],
+          };
+        }
+
+      },
     },
     data() {
       return {
+        advices:[],
         tableData: [],
         newoptions: [{
           value: '1',
@@ -213,7 +226,12 @@
         value: '1',
         input: 1
       }
-    }
+    },methods:{
+      setNewData:function(data){
+
+        // this.prescription.advices = data.advices
+      }
+    },
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -42,8 +42,10 @@
             <el-radio-button label="病历"></el-radio-button>
           </el-radio-group>
         </div>
-        <desk-prescription :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>
+        <desk-prescription 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>
       </div>
 
     </div>
@@ -56,9 +58,8 @@
   import deskRecord from './components/deskRecord'
   import { getPatientInfo, getSchedulePatientList } from '@/api/his/his'
 
-  import {
-    uParseTime
-  } from "@/utils/tools";
+  import { uParseTime } from '@/utils/tools'
+
   export default {
     components: {
       BreadCrumb,
@@ -67,11 +68,11 @@
     },
     data() {
       return {
-        prescriptions:[
+        prescriptions: [
           {
-            name:"处方1",
-            advice:[],
-            project:[],
+            name: '处方1',
+            advice: [],
+            project: []
           }
         ],
         search_input: '',
@@ -87,13 +88,11 @@
         patientTableData: [{}],
         patientInfo: {},
         hisPatientInfo: {},
-        case_history:{},
+        case_history: {}
       }
     },
     methods: {
-      changeTab(val){
-
-
+      changeTab(val) {
 
       },
       searchAction() {
@@ -144,40 +143,59 @@
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
-            this.patientInfo.birth = uParseTime(this.patientInfo.birthday, "{y}-{m}-{d}");
-            if(this.case_history.temperature <= 0){
-              this.case_history.temperature = ""
+            this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+            if (this.case_history.temperature <= 0) {
+              this.case_history.temperature = ''
             }
-            if(this.case_history.blood_sugar <= 0){
-              this.case_history.blood_sugar = ""
+            if (this.case_history.blood_sugar <= 0) {
+              this.case_history.blood_sugar = ''
             }
-            if(this.case_history.pulse <= 0){
-              this.case_history.pulse = ""
+            if (this.case_history.pulse <= 0) {
+              this.case_history.pulse = ''
             }
-            if(this.case_history.sbp <= 0){
-              this.case_history.sbp = ""
+            if (this.case_history.sbp <= 0) {
+              this.case_history.sbp = ''
             }
-            if(this.case_history.dbp <= 0){
-              this.case_history.dbp = ""
+            if (this.case_history.dbp <= 0) {
+              this.case_history.dbp = ''
             }
-            if(this.case_history.height <= 0){
-              this.case_history.height = ""
+            if (this.case_history.height <= 0) {
+              this.case_history.height = ''
             }
-            if(this.case_history.blood_fat <= 0){
-              this.case_history.blood_fat = ""
+            if (this.case_history.blood_fat <= 0) {
+              this.case_history.blood_fat = ''
             }
-            if(this.case_history.sick_type <= 0){
-              this.case_history.sick_type = ""
+            if (this.case_history.sick_type <= 0) {
+              this.case_history.sick_type = ''
             }
-            this.case_history.sick_date = uParseTime(this.case_history.sick_date, "{y}-{m}-{d}");
-            if(this.case_history.is_infect == 1){
+            this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+            if (this.case_history.is_infect == 1) {
               this.case_history.is_infect = true
-            }else{
+            } 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 index = i + 1
+                let obj = {
+                  name: "处方" + index,
+                  advices: prescription.advices,
+                  projects: prescription.project,
+                }
+                this.prescriptions.push(obj)
+              }
+            }else{
+              let obj = {
+                name: "处方" + 1,
+                advices: [],
+                projects: [],
+              }
+              this.prescriptions.push(obj)
+            }
+            console.log()
+            this.$refs.prescriptions.setData(this.prescriptions)
           }
         })