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

src/api/data.js

@@ -118,9 +118,9 @@ export function createBaseDrugLib(params) {
 }
 
 
-export function editBaseDrugLib(params) {
+export function editBaseDrugLib(params,unit) {
   return request({
-    url: '/api/basedruglib/edit',
+    url: '/api/basedruglib/edit?unit='+unit,
     method: 'post',
     params: params
   })

src/api/drug/drug.js

@@ -176,6 +176,7 @@ export function DeleteDrugName(params){
    })
 }
 
+
 export function getDrugDetail(params){
    return request({
       url:"/api/drug/getdrugdetail",
@@ -254,4 +255,14 @@ export function getRullerList(params){
       methods:"get",
       params:params
    })
+}
+
+
+export function DeleteDrugNameById(params){
+   
+   return request({
+      url:"/api/drug/deleteDrugNamebyid",
+      methods:"get",
+      params:params
+   })
 }

src/xt_pages/data/components/drugs.vue

@@ -114,7 +114,7 @@
   import maintain from './maintain'
   import addDrugs from './addDrugs'
   import { GetAllManufacturer } from '@/api/stock'
-
+  import { getDataConfig } from "@/utils/data";
   import {
     createBaseDrugLib,
     createDrugUnitSafeguard,
@@ -305,11 +305,20 @@
         return ''
       },
       goodInfoDialogComfirm: function(val) {
-
+        
+        //修改自备药
+        var untit = ""
+        var untis = getDataConfig('hemodialysis','units')
+        console.log("999999",untis)
+        for(let i=0;i<untis.length;i++){
+           if(val.min_unit == untis[i].id){
+              untit = untis[i].name
+           }
+        }
         if (val.id > 0) {
           //修改
           val['id'] = this.current_id
-          editBaseDrugLib(val).then(response => {
+          editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               return false
@@ -361,6 +370,7 @@
         // this.$refs.maintain.show();
       },
       openForm(id) {
+        
         this.getAllManufacturer()
         if (id > 0) {
           this.current_id = id
@@ -479,7 +489,10 @@
             }
           }
         })
-      }
+      },
+     getDataConfig(module, filed_name){
+        return getDataConfig(module, filed_name)
+      },
 
     }, created() {
       this.getList()

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -95,7 +95,7 @@
                         <el-table-column align="center" prop="name" label="操作" width="180">
                             <template slot-scope="scope">
                                 <el-button size="mini" type="primary" @click="toDetail(scope.row.drug_name,scope.row.drug_spec,scope.row.patient_id)">明细</el-button>
-                                <el-button size="mini" type="danger" @click="DeleteDrugName(scope.row.id,scope.row.drug_name,scope.row.patient_id,scope.$index)">删除</el-button>
+                                <el-button size="mini" type="danger" @click="DeleteDrugNameById(scope.row.id,scope.row.drug_name,scope.row.patient_id,scope.$index)">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -131,7 +131,7 @@ import medicineDetail from "./components/medicineDetail"
 import warehousing from "./components/warehousing"
 import warehouseOut from "./components/warehouseOut"
 const moment = require('moment')
-import { getCurrentPatient,saveRadio,getStockList,DeleteDrugName,getDrugSet } from "@/api/drug/drug"
+import { getCurrentPatient,saveRadio,getStockList,DeleteDrugNameById,getDrugSet } from "@/api/drug/drug"
 export default {
     components:{
         BreadCrumb,
@@ -244,7 +244,8 @@ export default {
           getStockList(params).then(response=>{
              if(response.data.state == 1){
                 var medicalList = response.data.data.medicalList
-                console.log("medicalist",medicalList)
+                console.log("medicalist2222",medicalList)
+
                 this.tableData = medicalList
                 var stocklist =  response.data.data.stocklist
                 console.log("stocklist",stocklist)
@@ -256,20 +257,22 @@ export default {
               }
           })  
         },
-        DeleteDrugName(id,name,patientid,index){
+        DeleteDrugNameById(id,name,patientid,index){
+            console.log("id",id)
+            console.log("name",name)
+            console.log("patientid",patientid)
             this.$confirm('确认删除吗?', '删除', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
             type: 'warning'
-         })
-          .then(() => {
+         }).then(() => {
               const params = {
                 id:id,
                 drugname:name,
                 patientid:patientid
               }
            
-            DeleteDrugName(params).then(response => {
+            DeleteDrugNameById(params).then(response => {
               if (response.data.state == 1) {
                   var msg = response.data.data.msg
                   this.tableData.splice(index, 1);

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -2408,7 +2408,7 @@ export default {
     //
     getSelfMedicalList(){
         const params = {
-          patient_id:this.$route.query.patient_id
+          patient_id:this.patientID
         }
       getSelfMedicalList(params).then(response=>{
          if (response.data.state == 1) {
@@ -2453,6 +2453,7 @@ export default {
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = medicalList[i].drug_specs
                 this.all_drug.push(obj)
+
               }
             }
 
@@ -2488,6 +2489,7 @@ export default {
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = base_drug_list[i].drug_specs
                 this.all_drug.push(obj)
+                console.log("中2222222222222222222",this.all_drug)
               }
             }   
         })
@@ -2529,6 +2531,7 @@ export default {
     }
   },
   created(){
+
     //获取自备药
      this.getSelfMedicalList()
   }