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

src/router/index.js

@@ -122,8 +122,8 @@ var _asy_router_map = [
   dialysisRecord,
   dialysis,
   stock,
-  selfPreparedMedicine,
   drugs,
+  selfPreparedMedicine,
   otherManagement,
   qcd,
   device,

src/views/layout/Layout.vue

@@ -16,9 +16,9 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-        <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库存管理')">
+        <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
-          <p>库存管理</p>
+          <p>库房管理</p>
         </div>
         <div v-if="kuyishoppingShow" :class="index == 4 ? 'navOne navActive' : 'navOne'" @click="clickActive(4,'酷医商城')">
           <i class="iconfont icon-shangcheng-1 navIcon"></i>
@@ -126,7 +126,7 @@ export default {
     let menzhen = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy']
     let bingli = ['User','createPatient']
     let touxi = ['workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control']
-    let kucun = ['stockManage','selfPreparedMedicine','stockDrugs','otherManagement']
+    let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement']
     let peizhi = ['system','roleManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config']
     let kuyishopping = ['kuyiShopping']
     let menzhenArr = []

src/views/layout/components/Sidebar/index.vue

@@ -120,8 +120,8 @@ export default {
             let a = false
             this.$emit('func',a)
           }
-        }else if(newVal == '库存管理'){
-          let nameArr = ['stockManage','selfPreparedMedicine','stockDrugs','otherManagement']
+        }else if(newVal == '库房管理'){
+          let nameArr = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {

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.drug_name,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>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -256,7 +256,7 @@ export default {
               }
           })  
         },
-        DeleteDrugName(name,patientid){
+        DeleteDrugName(id,name,patientid,index){
             this.$confirm('确认删除吗?', '删除', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -264,9 +264,11 @@ export default {
          })
           .then(() => {
               const params = {
+                id:id,
                 drugname:name,
                 patientid:patientid
               }
+            console.log("params ====",params)
             DeleteDrugName(params).then(response => {
               if (response.data.state == 1) {
                   var msg = response.data.data.msg

src/xt_pages/stock/selfPreparedMedicine/info.vue

@@ -29,7 +29,7 @@
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="操作" width="90">
                             <template slot-scope="scope">
-                                <el-button size="mini" type="danger" @click="DeleteDrugById(scope.row.id,scope.row.drug_name)">删除</el-button>
+                                <el-button size="mini" type="danger" @click="DeleteDrugById(scope.row.id,scope.row.drug_name,scope.$index)">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -333,6 +333,7 @@ export default {
           getAllDrugName().then(response=>{
              if(response.data.state == 1){
                var drugName  = response.data.data.drugName
+               console.log("drugName====",drugName)
                this.drugName = drugName
 
              }
@@ -356,7 +357,7 @@ export default {
          this.editRuleDialogVisible = false
        },
        saveDrugName(){
-           var name = ""
+           var name = "";
            for(let i=0;i<this.drugName.length;i++){
              if(this.drugName[i].id == this.drug_name){
                 name = this.drugName[i].drug_name
@@ -364,6 +365,7 @@ export default {
            }
            const params = {
               drug_name:name,
+              id:this.drug_name,
            }
          saveDrugName(params).then(response=>{
             if(response.data.state == 1){
@@ -381,10 +383,12 @@ export default {
            for(let i=0;i<this.drugName.length;i++){
              if(this.drugName[i].id == this.drug_name){
                 name = this.drugName[i].drug_name
+                
              }
            }
            const params = {
               drug_name:name,
+               id:this.drug_name
            }
          saveDrugName(params).then(response=>{
             if(response.data.state == 1){
@@ -540,7 +544,7 @@ export default {
          })
        },
 
-       DeleteDrugById(id,drugname){
+       DeleteDrugById(id,drugname,index){
          this.$confirm('确认删除吗?', '删除', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',
@@ -554,6 +558,7 @@ export default {
             DeleteDrugById(params).then(response => {
               if (response.data.state == 1) {
                   var msg = response.data.data.msg
+                  this.tableData.splice(index,1)
                   this.$message.success("删除成功",msg)
               } else {
                   this.$message.error("该药品名称下有药品规格，不能删除")