Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/data/basicConfig.vue

@@ -57,6 +57,11 @@
             <p style="margin-top:20px;">药品在执行时自备药出库：
                <el-switch v-model="self_drug_out_open" @change="changeSelfPrescriptionOutOpen"></el-switch>
             </p>
+
+            
+            <p style="margin-top:20px;">药品在患者发药显示：
+               <el-switch v-model="drug_code_open" @change="changeDrugCodeOpen"></el-switch>
+            </p>
         </div>
 
 
@@ -112,7 +117,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig,changeSettleOpenConfig,changeGoodOutOpen,changeSelfPrescriptionOpen,changeSelfPrescriptionOutOpen,getSelfPrintList} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig,changeSettleOpenConfig,changeGoodOutOpen,changeSelfPrescriptionOpen,changeSelfPrescriptionOutOpen,getSelfPrintList,changeDrugCodeOpen} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -137,7 +142,8 @@ export default {
       drug_settle_open:false,
       good_out_open:false,
       self_prescription_out_open:false,
-      self_drug_out_open:false
+      self_drug_out_open:false,
+      drug_code_open:false,
     };
   },
   methods: {
@@ -195,6 +201,12 @@ export default {
               this.good_out_open = false
             }
 
+            if(response.data.data.is_code_open == 1){
+               this.drug_code_open = true
+            }else{
+                this.drug_code_open = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -536,7 +548,27 @@ export default {
            }
         }
       })
+    },
+    changeDrugCodeOpen(){
+
+      var drug_out_open = 0 
+        if(this.drug_code_open == true){
+          drug_out_open = 1
+        }
+        if(this.drug_code_open == false){
+          drug_out_open = 2
+        }
+        var params = {
+          is_open:drug_out_open,
+        }
+      changeDrugCodeOpen(params).then(response=>{
+         if(response.data.state ==1){
+           var drugCodeOpen = response.data.data.drugCodeOpen
+           this.$message.success("保存成功!")
+         }
+      })
     }
+    
   },
   created() {
     this.getInitIsOpenConfig()

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -126,6 +126,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="生产厂商" align="center">
+          <template slot-scope="scope">
+            {{ getManufactuerName(scope.row.manufacturer) }}
+          </template>
+        </el-table-column>
+
         <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             {{ getTypeName(scope.row) }}

src/xt_pages/stock/detail/stockInDetail.vue

@@ -131,6 +131,12 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="生产厂商" align="center">
+            <template slot-scope="scope">
+              {{ getManufactuerName(scope.row.manufacturer) }}
+            </template>
+          </el-table-column>
+
           <el-table-column label="操作时间" align="center">
             <template slot-scope="scope">
               {{ getTime(scope.row.Warehousing.warehousing_time) }}

src/xt_pages/stock/drugs/components/drugCancelDetail.vue

@@ -118,6 +118,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+           {{getManufacturerName(scope.row.GoodInfo.manufacturer)}}
+          </template>
+        </el-table-column>
+
         <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.type == 1">药品退库单</span>
@@ -377,6 +383,7 @@ export default {
          if(response.data.state == 1){
            loading.close()
            var order =  response.data.data.order
+           console.log("order=----------------",order)
            var list = response.data.data.orderPrint
            this.dealerList =  response.data.data.dealerList
            this.manufacturerList =  response.data.data.manufacturerList

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -128,6 +128,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+           {{getManufacturerName(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
             <span>{{getTime(scope.row.ctime)}}</span>

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))