新分支

src/api/drug/drug.js

@@ -731,7 +731,7 @@ export function getSelfDrugWarehouseInfoById(id,params){
 export function ModifySelfDrugWarehouse(data,patient_id,warehousing_time,warehousing_id){
  
   return request({
-    url:"/api/drug/modifyselfdrugwarehouse?patient_id="+patient_id+"warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
+    url:"/api/drug/modifyselfdrugwarehouse?patient_id="+patient_id+"&warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
     method:"post",
     data:data,
   })
@@ -827,4 +827,48 @@ export function getSelfDrugQuery(params){
     method:"get",
     params:params
   })
+}
+
+export function checkSelfOutDrugQuery(params){
+  
+  return request({
+    url:"/api/drug/checkselfdrugoutquery",
+    method:"Get",
+    params:params
+  })
+}
+
+export function returnCheckSelfOutDrugQuery(params){
+  
+   return request({
+    url:"/api/drug/returncheckselfoutdrugquery",
+    method:"get",
+    params:params,
+   })
+}
+
+export function returnSelfCheckWarehouse(params){
+ 
+  return request({
+    url:"/api/drug/returnselfcheckwarehouse",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getSelfDrugFlow(params){
+  return request({
+    url:"/api/drug/getselfdrugflow",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getSelfDrugBatchNumberList(params){
+ 
+  return request({
+    url:"/api/drug/getselfdrugbatchnumberlist",
+    method:"Get",
+    params:params
+  })
 }

src/router/modules/selfPreparedMedicine.js

@@ -74,6 +74,24 @@ export default {
       hidden: true,
       is_menu: false,
     },
+
+    {
+      path: '/stock/selfwarehouse/selfdrugflow',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/selfDrugFlow'),
+      name: 'selfdrugflow',
+      meta: { title: '自备药流水', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
+
+    {
+      path: '/stock/selfwarehouse/selfdrugbatchnumber',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/selfDrugBatchNumber'),
+      name: 'selfdrugflow',
+      meta: { title: '自备药批次', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
     
     {
       path: '/stock/selfPreparedMedicineIndex',

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -400,7 +400,7 @@
                         血管通路：
                         <div
                           class="under_line"
-                          style="width: 200px; text-align: center"
+                          style="width: 280px; text-align: center"
                         >
                           {{
                             record.assessment_before_dislysis &&
@@ -408,15 +408,10 @@
                               .blood_access_part_id
                               ? record.assessment_before_dislysis
                                   .blood_access_part_id
-                              : 0
+                              :  ""
                           }}
                           {{
-                            record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis
-                              .blood_access_part_opera_name
-                              ? record.assessment_before_dislysis
-                                  .blood_access_part_opera_name
-                              : ""
+                            bloodAccessParOperaName(record.assessment_before_dislysis.blood_access_part_opera_id)
                           }}
                         </div>
                       </div>
@@ -3014,7 +3009,7 @@
                         实际超滤量：
                         <div
                           class="under_line"
-                          style="width: 100px; text-align: center"
+                          style="width: 80px; text-align: center"
                         >
                           {{
                             record.assessment_after_dislysis &&
@@ -3798,10 +3793,12 @@ export default {
     };
   },
   created() {
+   
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
     );
+    this.bloodAccessParOpera = bloodAccessParOpera
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");
     this.appetite_arr = getDataConfig("hemodialysis", "appetite");
@@ -4427,6 +4424,12 @@ export default {
       }
       return displace_liqui_part_name;
     },
+    bloodAccessParOperaName(id) {
+      if (id in this.bloodAccessParOpera) {
+        return this.bloodAccessParOpera[id].name;
+      }
+      return "";
+    },
   },
 };
 </script>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -13,8 +13,9 @@
            
             <span style="position: absolute;left: 20%;top: 3%">
               透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
-            
             </span>
+
+          
            
             <span style="position: absolute;left: 30%;top: 3%">
               干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
@@ -23,22 +24,28 @@
               衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:""}}kg
             </span> -->
             <span style="position: absolute;left:38%;top: 3%">
-              上次透后体重：{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg
+              上次透后体重：
+               <span v-if="this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10702">{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg</span> 
+               <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span> 
             </span>
 
-            <span style="position: absolute;left:50%;top: 3%">
+            <span style="position: absolute;left:51%;top: 3%">
               4小时超滤量上限（5%）：
               <span v-if="predialysis!=null && ((predialysis.dry_weight)*0.05) >0 "></span> {{(predialysis.dry_weight*0.05).toFixed(2)}}
               kg
             </span>
-            <span style="position: absolute;left: 70%;top: 3%">
+            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
               透前血压:  {{predialysis&&predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
             </span>
 
-            <!-- <span style="position: absolute;left: 20%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702">
-              透前体重：{{predialysis&&(predialysis.weight_before - predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
+            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id==0||this.$store.getters.xt_user.template_info.org_id==10702">
+             衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:"" }} kg
+            </span>
+
+            <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702">
+              体重增长：{{predialysis&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
             
-            </span> -->
+            </span>
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
                     ref="dialysisPrescription"

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -73,11 +73,10 @@
           {{ scope.row.index }}
         </template>
       </el-table-column>
-<!--      <el-table-column align="center" label="处方日期">-->
-<!--        <template slot-scope="scope">{{-->
-<!--          getTime(scope.row.record_date)-->
-<!--        }}</template>-->
-<!--      </el-table-column>-->
+     <el-table-column align="center" label="处方日期">
+        <template slot-scope="scope">
+          {{getTime(scope.row.record_date)}}</template>
+      </el-table-column>
       <el-table-column align="center" label="费用编码">
         <template slot-scope="scope">
           {{ scope.row.number }}

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -73,13 +73,13 @@
           {{ scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column align="center" label="处方日期">
+      <!-- <el-table-column align="center" label="处方日期">
         <template slot-scope="scope">
           <span v-if="scope.row.record_date > 0"
             >{{ getTimes(scope.row.record_date) }}
           </span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column align="center" label="费用分类">
         <template slot-scope="scope">
           <span v-if="scope.row.type == 1">

src/xt_pages/stock/selfPreparedMedicine/addWarehouseInfo.vue

@@ -969,29 +969,7 @@
            }
         })
       },
-      toReturnCheck(){
-         const loading = this.$loading({
-          lock: true,
-          text: "Loading",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.7)",
-        });
-          var params = {
-            warehousing_id:this.warehousing_id,
-          }
-        toReturnCheckWarehousing(params).then(response=>{
-           if(response.data.state == 1){
-            var list = response.data.data.list
-             this.$message.success("反审核成功!")
-             this.showCheck = true
-             this.showReturnCheck = false
-             loading.close()
-           }else{
-            this.$message.error("反审核失败!")
-            loading.close()
-           }
-        })
-      },
+    
       changeUnit(val,index){
     
       },

src/xt_pages/stock/selfPreparedMedicine/addWarehouseOut.vue

@@ -351,7 +351,7 @@
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList, postSearchDrugList } from "@/api/data";
-    import { getallPatientList,postSearchSelfDrugList,postSelfDrugWarehouseOut,getSelfDrugBatchNumber} from "@/api/drug/drug"
+  import { getallPatientList,postSearchSelfDrugList,postSelfDrugWarehouseOut,getSelfDrugBatchNumber,checkSelfOutDrugQuery} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -1162,7 +1162,35 @@
         }
         return total;
       },
-    
+      toCheck(){
+         var params = {
+            warehouse_out_id:this.warehouse_out_id,
+            patient_id:this.patient_id,
+         }
+        checkSelfOutDrugQuery(params).then(response=>{
+          if(response.data.state ==1){
+            var warehousingOutInfoList = response.data.data.warehousingOutInfoList
+              var msg =response.data.data.msg
+              if(msg == 1){
+                this.$message.success("审核成功!")
+                this.showCheck = false
+                this.showReturnCheck = true
+                this.$router.back(-1)
+              }
+              if(msg == 2){
+                var drug_name = response.data.data.drug_name
+                var dose = response.data.data.dose
+                var dose_unit = response.data.data.dose_unit
+                var min_number = response.data.data.min_number
+                var min_unit = response.data.data.min_unit
+                var max_unit = response.data.data.max_unit
+                var str = drug_name +" " +dose +dose_unit +"*" + min_number + min_unit +"/" + max_unit;
+                this.$message.error(str+"库存不足，审核失败!")
+              }
+              loading.close()
+          }
+        })
+      }
     
     },
     created() {

src/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo.vue

@@ -23,6 +23,14 @@
             class="filter-item"
             >审核</el-button
           >
+
+          <el-button
+            size="small"
+            type="primary"
+           v-if="is_check == 1 && parseInt(this.$route.query.is_sys) == 0"
+            @click="toReturnCheck()"
+            class="filter-item"
+            >反审核</el-button>
         </div>
       </div>
       <div class="app-container" v-loading="loading">
@@ -340,13 +348,11 @@
   import { uParseTime } from "@/utils/tools";
   import {
     GetAllDrugInfoByID,
-    toCheckWarehousingInfo,
-    toReturnCheckWarehousing,
   } from "@/api/drug/drug_stock";
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList } from "@/api/data";
-  import { getallPatientList,postSearchSelfDrugList,ModifySelfDrugWarehouse,getSelfDrugWarehouseInfoById,deleteSelfWarehouseInfo} from "@/api/drug/drug"
+  import { getallPatientList,postSearchSelfDrugList,ModifySelfDrugWarehouse,getSelfDrugWarehouseInfoById,deleteSelfWarehouseInfo,toCheckSelfWarehousingInfo,returnSelfCheckWarehouse} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -468,6 +474,8 @@
         showReturnCheck:false,
         patientList:[],
         id:0,
+        is_check:0,
+        is_sys:0,
       };
     },
     methods: {
@@ -739,6 +747,9 @@
               stockIn: this.recordInfo.recordData,
             };
             console.log("params=---------------",params)
+            console.log("patinet_id-----------",this.patient_id)
+            console.log("warehousing_time-----------",this.warehousing_time)
+            console.log("warehousing_id--------------",this.warehousing_id)
             ModifySelfDrugWarehouse(
               params,
               this.patient_id,
@@ -752,6 +763,8 @@
               } else {
                 this.loading = false;
                 this.$message.success("保存成功");
+                this.showCheck = true
+                this.showReturnCheck = false
                 this.listLoading = false;
                 var list = response.data.data.list
                 var manufacturerList = response.data.data.manufacturerList
@@ -795,8 +808,7 @@
                 this.recordInfo.recordData = []
                 console.log("list========================",list)
                 this.recordInfo.recordData = list
-                this.showCheck = true
-                this.showReturnCheck = false
+               
               }
             });
           } else {
@@ -929,8 +941,10 @@
         });
          var params = {
            warehousing_id:this.warehousing_id,
+           patient_id:this.patient_id
          }
-        toCheckWarehousingInfo(params).then(response=>{
+         console.log("praams------",params)
+        toCheckSelfWarehousingInfo(params).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
              this.$message.success("审核成功!")
@@ -953,8 +967,9 @@
         });
           var params = {
             warehousing_id:this.warehousing_id,
+            patient_id:this.patient_id,
           }
-        toReturnCheckWarehousing(params).then(response=>{
+        returnSelfCheckWarehouse(params).then(response=>{
            if(response.data.state == 1){
             var list = response.data.data.list
              this.$message.success("反审核成功!")
@@ -967,18 +982,21 @@
            }
         })
       },
-      changeUnit(val,index){
-    
-      },
-       
-
       //新
       getSelfDrugWarehouseInfoById(id){
         getSelfDrugWarehouseInfoById(id).then(response=>{
            if(response.data.state == 1){
              var info = response.data.data.info
+             if(info.is_check == 2){
+               this.showCheck = true
+               this.showReturnCheck = false
+             }
+             if(info.is_check == 1){
+                this.showCheck = false
+                this.showReturnCheck = true
+             }
              this.patient_id = info.patient_id
-             this.warehousing_time  =this.getTime(info.record_date)
+             this.warehousing_time  =this.getTimeOne(info.record_date)
              this.manufacturerList = response.data.data.manufacturerList
              this.dealerList = response.data.data.dealerList
              this.drugTypeList = response.data.data.drugTypeList
@@ -990,9 +1008,9 @@
              tempObj["drug_name"] = info.drug.drug_name;
              tempObj["max_unit"] = info.max_unit;
              tempObj["min_unit"] = info.min_unit,
-             tempObj["product_date"] = this.getTime(info.product_date);
-             tempObj["expiry_date"] = this.getTime(info.expiry_date);
-             tempObj["warehousing_count"] = info.warehousing_count;
+             tempObj["product_date"] = this.getTimeOne(info.product_date);
+             tempObj["expiry_date"] = this.getTimeOne(info.expiry_date);
+             tempObj["warehousing_count"] = info.warehousing_count.toString();
              tempObj["remark"] = info.remark;
              tempObj["dealer"] =this.getDealer(info.dealer) 
              tempObj["manufacturer"] = this.getManufacturer(info.manufacturer);
@@ -1033,14 +1051,16 @@
             }
             return name
       },
+      
     },
     created() {
       var id =  this.$route.query.id
       var is_sys = this.$route.query.is_sys
+      this.is_sys = is_sys
+      console.log("is_check-=------------------------------------",is_sys)
       var is_check = this.$route.query.is_check
-      console.log("id",id)
-      console.log("is_sys",is_sys)
-      console.log("is_check",is_check)
+      console.log("is_check-=------------------------------------",is_check)
+      this.is_check= is_check
       this.drugTypeList = getDictionaryDataConfig("system", "drug_type");
       this.getallPatientList() 
       this.getSelfDrugWarehouseInfoById(id)

src/xt_pages/stock/selfPreparedMedicine/editWarehouseOut.vue

@@ -23,6 +23,15 @@
             class="filter-item"
             >审核</el-button
           >
+
+          <el-button
+          size="small"
+          type="primary"
+          v-if="is_check == 1 && parseInt(this.$route.query.is_sys) == 0"
+          @click="toReturnCheck"
+          class="filter-item"
+          >反 审 核</el-button
+        >
        
         </div>
       </div>
@@ -346,12 +355,11 @@
   import {
     GetAllConfig,
     GetAllDrugInfoByID,
-    postDrugWarehouse,
   } from "@/api/drug/drug_stock";
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList, postSearchDrugList } from "@/api/data";
-    import { getallPatientList,postSearchSelfDrugList,modifySelfDrugWarehouseOut,getSelfDrugBatchNumber,getSelfDrugWarehouseOutById} from "@/api/drug/drug"
+  import { getallPatientList,postSearchSelfDrugList,modifySelfDrugWarehouseOut,getSelfDrugBatchNumber,getSelfDrugWarehouseOutById,checkSelfOutDrugQuery,returnCheckSelfOutDrugQuery} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -1237,6 +1245,56 @@
             }
             return name
       },
+
+      toCheck(){
+         var params = {
+            warehouse_out_id:this.warehouse_out_id,
+            patient_id:this.patient_id,
+         }
+        checkSelfOutDrugQuery(params).then(response=>{
+          if(response.data.state ==1){
+            var warehousingOutInfoList = response.data.data.warehousingOutInfoList
+              var msg =response.data.data.msg
+              if(msg == 1){
+                this.$message.success("审核成功!")
+                this.showCheck = false
+                this.showReturnCheck = true
+                this.$router.back(-1)
+              }
+              if(msg == 2){
+                var drug_name = response.data.data.drug_name
+                var dose = response.data.data.dose
+                var dose_unit = response.data.data.dose_unit
+                var min_number = response.data.data.min_number
+                var min_unit = response.data.data.min_unit
+                var max_unit = response.data.data.max_unit
+                var str = drug_name +" " +dose +dose_unit +"*" + min_number + min_unit +"/" + max_unit;
+                this.$message.error(str+"库存不足，审核失败!")
+              }
+              loading.close()
+          }
+        })
+      },
+      toReturnCheck(){
+         var params = {
+           warehouse_out_id:this.warehouse_out_id,
+           patient_id:this.patient_id,
+         }
+        returnCheckSelfOutDrugQuery(params).then(response=>{
+           if(response.data.state ==1){
+            var out = response.data.data.out
+            this.$message.success("反审核成功!")
+            this.showCheck = true
+            this.showReturnCheck = false
+            loading.close()
+            this.$router.back(-1)
+           }else{
+            this.$message.error(response.data.msg)
+            loading.close()
+            this.$router.back(-1);
+           }
+        })
+      }
     
     
     },

src/xt_pages/stock/selfPreparedMedicine/warehouseInfo.vue

@@ -37,7 +37,7 @@
           style="width: 200px"
           v-model.trim="searchKey"
           class="filter-item"
-          placeholder="单据编码/制单人/药品名称"
+          placeholder="药品名称"
         />
         <el-button
           size="small"
@@ -191,6 +191,7 @@
 
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
+           
             {{ getManufacturer(scope.row.manufacturer) }}
           </template>
         </el-table-column>
@@ -207,6 +208,13 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="审核状态" align="center">
+          <template slot-scope="scope">
+             <span v-if="scope.row.is_check ==1">已审核</span>
+             <span v-if="scope.row.is_check ==2">未审核</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
              {{ scope.row.remark }}
@@ -274,7 +282,6 @@ import {
   exportDrugList,
 
 } from "@/api/drug/drug_stock";
-import { getAllDrugList } from "@/api/data";
 import { getDictionaryDataConfig } from "@/utils/data";
 import BreadCrumb from "../../components/bread-crumb";
   import { getallPatientList,getAllSelfDrugWarehouseInfoList,deleteSelfWarehouseInfo} from "@/api/drug/drug"
@@ -368,7 +375,6 @@ export default {
       patient_id:0,
       patientList:[],
       tableList:[],
-      manufacturerList:[],
       dealerList:[],
       drugTypeList:[],
     };
@@ -384,9 +390,9 @@ export default {
         getAllSelfDrugWarehouseInfoList(params).then(response=>{
           if(response.data.state ==1){
             var infoList  =  response.data.data.infoList
-            console.log("infolist22222222222222",infoList)
             this.tableList = infoList
             this.manufacturerList = response.data.data.manufacturerList
+            console.log("infolist22222222222222",this.manufacturerList)
             this.dealerList = response.data.data.dealerList
             this.drugTypeList = response.data.data.drugTypeList
 
@@ -517,39 +523,18 @@ export default {
     },
     handleSearch(id) {
       this.WarehouseInfo.warehouseInfoDate = [];
-      this.GetOrderDetail(id);
       this.dialogVisible = true;
     },
-    GetOrderDetail(order_id) {
-      const params = {
-        id: order_id,
-      };
-
-      this.WarehouseInfo.warehouseInfoDate = [];
-      getDrugWarehouseInfoList(params).then((response) => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          var obj = {total_count:0,is_total:1}
-          for (let i = 0; i < response.data.data.info.length; i++) {
-            response.data.data.info[i].is_total = 0
-            this.showOne = true;
-            this.WarehouseInfo.warehouseInfoDate.push(
-              response.data.data.info[i]
-            );
-            obj.total_count += (response.data.data.info[i].warehousing_count *response.data.data.info[i].price)
-          }
-          this.WarehouseInfo.warehouseInfoDate.push(obj)
-        
-          this.WarehouseInfo.warehouse = response.data.data.warehousing;
-          this.getAllDrugList();
-        }
-      });
-    },
     handleDelete: function (index, row) {
-
-        this.$confirm('确定删除' + row.name + row.sub_name + '方案吗？', '提示', {
+        if(row.is_check ==1){
+          this.$message.error("该药品已经审核,不能删除!")
+          return false
+        }
+        if(row.is_sys ==1){
+          this.$message.error("该药瓶自动入库,不能删除!")
+          return false
+        }
+        this.$confirm('确定删除吗？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -650,7 +635,7 @@ export default {
         .catch(() => {});
     },
     handleCurrentChangeOne(val) {
-      this.GetOrderDetail(val.id);
+     
     },
     getTime(val) {
       if (val < 0) {
@@ -671,18 +656,12 @@ export default {
       }
       return name;
     },
-    getAllDrugList() {
-      getAllDrugList().then((response) => {
-        if (response.data.state == 1) {
-          var manufacturerList = response.data.data.manufacturerList;
-          this.manufacturerList = manufacturerList;
-          this.dealerList = response.data.data.dealerList;
-        }
-      });
-    },
+    
     getManufacturer(id) {
       var name = "";
+      console.log("manufacturerList-=------",this.manufacturerList)
       for (let i = 0; i < this.manufacturerList.length; i++) {
+
         if (id == this.manufacturerList[i].id) {
           name = this.manufacturerList[i].manufacturer_name;
         }
@@ -734,9 +713,6 @@ export default {
       });
     },
 
-    lili(){
-      console.log("exportList",this.exportList)
-    },
     toExport() {
       if (this.order_id == "") {
         this.$message.error("请勾选入库单");
@@ -853,7 +829,6 @@ export default {
         getallPatientList().then(response=>{
           if(response.data.state ==1){
             var patient = response.data.data.patient
-            console.log("patient====",patient)
             this.patientList = []
             var obj = {id:0,name:"全部"}
             this.patientList.push(obj)
@@ -872,15 +847,6 @@ export default {
         }
         return name
       },
-      getManufacturer(id){
-         var manufacturer_name = ""
-         for(let i=0;i<this.manufacturerList.length;i++){
-           if(id == this.manufacturerList[i].id){
-            manufacturer_name = this.manufacturerList[i].manufacturer_name
-           }
-         }
-         return
-      },
       getDealerName(id){
         var dealer_name = ""
         for(let i=0;i<this.dealerList.length;i++){

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))