Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/his/his.js

@@ -0,0 +1,58 @@
+import request from "@/utils/request";
+
+
+
+export function getSchedulePatientList(params) {
+  return request({
+    url: "/api/hispatient/list",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function getPatientInfo(params) {
+  return request({
+    url: "/api/hispatient/get",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function createCaseHistory(params) {
+  return request({
+    url: "/api/doctorworkstation/casehistory/create",
+    method: "post",
+    params:params
+  });
+}
+
+
+
+
+
+
+
+// export function createCaseHistory(params) {
+//   return request({
+//     url: "/api/doctorworkstation/casehistory/create",
+//     method: "post",
+//     params:params
+//   });
+// }
+
+
+// export function createCaseHistory(params) {
+//   return request({
+//     url: "/api/doctorworkstation/casehistory/create",
+//     method: "post",
+//     params:params
+//   });
+// }
+
+
+
+
+
+

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -56,7 +56,7 @@
                             :name="item.name"
                         >
                             <div class="RP">Rp</div>
-                            <prescription-table :preDrugs="preDrugs" :activeType="activeName"></prescription-table>
+                            <prescription-table :prescription="item" :preDrugs="preDrugs" :activeType="activeName"></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-tabs>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="prescriptionTable">
-    <el-table v-if="activeType  == '1'" :data="preDrugs" border style="width: 98%;" :row-style="{ color: '#303133' }"
+    <el-table v-if="activeType  == '1'" :data="prescription.advice" 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>
@@ -78,7 +78,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-table v-if="activeType  == '2'" :data="preDrugs" border style="width: 98%;" :row-style="{ color: '#303133' }"
+    <el-table v-if="activeType  == '2'" :data="prescription.project" 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>
@@ -188,7 +188,8 @@
   export default {
     props: {
       preDrugs: Array,
-      activeType: String
+      activeType: String,
+      prescription:Object,
     },
     data() {
       return {