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

src/api/drug/drug.js

@@ -265,4 +265,22 @@ export function DeleteDrugNameById(params){
       methods:"get",
       params:params
    })
-}
+}
+
+export function getPatientDetail(id,params){
+
+   return request({
+      url:"/api/drug/getpatientdetail?id="+id,
+      methods:"Get",
+      params:params
+   })
+}
+
+// export function toSeachPatient(params){
+   
+//    return request({
+//       url:"/api/drug/toseachpatient",
+//       methods:"Get",
+//       params:params
+//    })
+// }

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -40,7 +40,7 @@
                     <div class="name">{{ item.name }}</div>
                   </template>
                 </el-autocomplete>
-
+                <el-button type="primary" @click="toSeachPatient">搜索</el-button>
             </div>
             <el-container>
                 <div style="width:160px;">
@@ -137,7 +137,7 @@ import warehousing from "./components/warehousing"
 import warehouseOut from "./components/warehouseOut"
 const moment = require('moment')
 import { PostSearch } from '@/api/patient'
-import { getCurrentPatient,saveRadio,getStockList,DeleteDrugNameById,getDrugSet } from "@/api/drug/drug"
+import { getCurrentPatient,saveRadio,getStockList,DeleteDrugNameById,getDrugSet,getPatientDetail} from "@/api/drug/drug"
 export default {
     components:{
         BreadCrumb,
@@ -359,8 +359,7 @@ export default {
           })
           return searchArray
         },
-        handleSelect(val){
-          console.log("val",val)
+        handleSelect(val){   
           this.search_input = val.name
           for(let i=0;i<this.tablePatient.length;i++){
              if(this.tablePatient[i].id == val.id){
@@ -368,6 +367,22 @@ export default {
              }
           }
           this.getlist()
+          this.getPatientDetail(val.id)
+        },
+
+        getPatientDetail(id){
+          getPatientDetail(id).then(response=>{
+             if(response.data.state == 1){
+               var patientDetail =  response.data.data.patientDetail
+               console.log("patientDetail",patientDetail)
+               var arr = []
+               arr.push(patientDetail)
+               this.tablePatient = arr
+             }
+          })
+        },
+        toSeachPatient(){
+          this.getCurrentPatient()
         }
     },
     created(){
@@ -378,7 +393,6 @@ export default {
     watch: {
      tablePatient: function() {
       this.$nextTick(function() {
-         console.log("222222",this.tablePatient[0])
         this.$refs.monthlyPlanTable.setCurrentRow(this.tablePatient[0])
       })
     }

src/xt_pages/stock/selfPreparedMedicine/query.vue

@@ -93,7 +93,7 @@
                     <template slot-scope="scope">{{ scope.row.Count }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="剩余" width="80">
-                    <template slot-scope="scope">{{ scope.row.Total?scope.row.Total:0 - scope.row.Count }}</template>
+                    <template slot-scope="scope">{{ (scope.row.Total?scope.row.Total:0) - scope.row.Count }}</template>
                 </el-table-column>
             </el-table>
         </div>

src/xt_pages/stock/selfPreparedMedicine/queryPrint.vue

@@ -42,7 +42,7 @@
                                     <!-- <td>{{item.min_unit}}</td> -->
                                     <td>{{item.Total?item.Total:0}}</td>
                                     <td>{{item.Count}}</td>
-                                    <td>{{item.Total?item.Total:0 - item.Count}}</td>
+                                    <td>{{(item.Total?item.Total:0) - item.Count}}</td>
                                 </tr>
                             </tbody>
                         </table>