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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -239,7 +239,7 @@
                     </div>
 
                     <div class="row" style="padding: 2px 0; line-height: 23px">
-                      <div class="inline_block">
+                      <div class="inline_block" v-if="org_id!=10624">
                         T：
                         <div
                           class="under_line"
@@ -2765,7 +2765,7 @@
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1" v-if="org_id!=10624">
                         T：
                         <div
                           class="under_line"

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -3100,6 +3100,24 @@ export default {
       if(val == 37){
         name ="HDF1000"
       }
+      if(val == 38){
+        name ="HDF80"
+      }
+      if(val == 39){
+        name ="HF16"
+      }
+      if(val == 40){
+        name ="HD(无肝素)"
+      }
+      if(val == 41){
+        name ="HDF17H"
+      }
+      if(val == 42){
+        name ="HD."
+      }
+      if(val == 43){
+        name ="HD(2)"
+      }
       return name
     },
   },

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -229,7 +229,7 @@
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px">
-                    <div class="inline_block">
+                    <div class="inline_block" v-if="org_id!=10624">
                       T：
                       <div
                         class="under_line"
@@ -2548,7 +2548,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10624">
                       T：
                       <div
                         class="under_line"

src/xt_pages/medicalScheduling/index.vue

@@ -733,7 +733,7 @@ export default {
             getStaffScheduleList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList =  response.data.data.staffList
-                    console.log("获取所有排班",staffList)
+                    // console.log("获取所有排班",staffList)
                     var sevenStr = ""
                     var oneStr = ""
                     var twoStr = ""
@@ -2230,9 +2230,12 @@ export default {
             }
 
         }
-      var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
+    //   var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
+      
+      var now = moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
+      console.log("日期==========---------------",now)
       this.timeNow = this.getTimestamp(now)
-     
+      console.log("haaaaaaaaaaaaaaaaaaa",this.timeNow)
       this.getStaffScheduleRemarkList()
 
     }

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -391,13 +391,20 @@ export default {
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
       };
-
+      const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+       })
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
+          loading.close()
           return false;
         } else {
+          loading.close()
           this.total = response.data.data.total;
           var obj = {id:0,storehouse_name:"全部"}
           this.houseList = []

src/xt_pages/stock/detail/stockInDetail.vue

@@ -396,11 +396,19 @@ export default {
         storehouse_id:this.storehouse_id,
       };
       this.cancelStockDate = [];
+      const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+       })
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
+          loading.close()
           return false;
         } else {
+          loading.close()
           this.total = response.data.data.total;
           var obj = {id:0,storehouse_name:"全部"}
           this.houseList = []
@@ -842,6 +850,8 @@ export default {
           this.tableDataList[i].total_price = (this.tableDataList[i].warehousing_count * this.tableDataList[i].price).toFixed(2)
           this.tableDataList[i].manufacturer_name = this.getManufactuerName(this.tableDataList[i].manufacturer)
           this.tableDataList[i].dealer_name = this.getDealerName(this.tableDataList[i].dealer)
+          this.tableDataList[i].expiry_date_name = this.getTime(this.tableDataList[i].expiry_date)
+          this.tableDataList[i].product_date_name = this.getTime(this.tableDataList[i].product_date)
           total += this.tableDataList[i].warehousing_count * this.tableDataList[i].price
           
         }
@@ -849,12 +859,13 @@ export default {
         this.tableDataList.push(obj)
       
         import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','数量','总价']
-        const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','time','user_name','price','warehousing_count','total_price']
+        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','数量','总价']
+        const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','number','product_date_name','expiry_date_name','time','user_name','price','warehousing_count','total_price']
 
 
         const data = this.formatJson(filterVal, this.tableDataList)
-
+        console.log("this.tableDataList",this.tableDataList)
+       
           excel.export_json_to_excel({
             header: tHeader,
             data,

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -428,12 +428,19 @@ export default {
         storehouse_id:this.storehouse_id,
       };
       this.cancelStockDate = [];
+      const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+       })
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
+          loading.close()
           this.$message.error(response.data.msg);
           return false;
         } else {
-
+          loading.close()
           this.total = response.data.data.total;
           var obj = {id:0,storehouse_name:"全部"}
           this.houseList = []
@@ -529,7 +536,9 @@ export default {
       // this.getPrintStockGood()
     },
     getAllQuery(){
+      this.cancelStockDate = []
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -962,6 +971,7 @@ export default {
      },
      exportListDetail(){
         console.log("hahhdhafhhahdf",this.tableDataList)
+      
         var obj = {index:"合计",total_price:0}
         var total = 0
         for(let i=0;i<this.tableDataList.length;i++){
@@ -984,15 +994,17 @@ export default {
           }
           this.tableDataList[i].in_price = this.tableDataList[i].WarehousingInfoNight.price
 
-          this.tableDataList[i].expiry_date = this.getTime(this.tableDataList[i].expiry_date)
+          this.tableDataList[i].expiry_date_name = this.getTime(this.tableDataList[i].expiry_date)
+
+          this.tableDataList[i].product_date_name = this.getTime(this.tableDataList[i].product_date)
         }
         obj.total_price = total.toFixed(2)
         console.log("WOHHAHHAHAH",this.tableDataList)
       
         this.tableDataList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','time','user_name','in_price','price','out_count','total_price']
+       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','time','number','product_date_name','expiry_date_name','user_name','in_price','price','out_count','total_price']
 
        const data = this.formatJson(filterVal, this.tableDataList)
 

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

@@ -367,8 +367,15 @@ export default {
         limit:this.limit,
         page:this.page,
        }
+       const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+       })
       getDrugCancelDetail(params).then(response=>{
          if(response.data.state == 1){
+           loading.close()
            var order =  response.data.data.order
            var list = response.data.data.orderPrint
            this.dealerList =  response.data.data.dealerList
@@ -410,6 +417,8 @@ export default {
            this.tableList = order
            var total = response.data.data.total
            this.total = total
+         }else{
+          loading.close()
          }
       })
     },

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

@@ -397,14 +397,23 @@ export default {
         limit:this.limit,
         page:this.page,
       }
+      const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+       })
       getDrugCancelOrder(params).then(response=>{
         if(response.data.state == 1){
+          loading.close()
           var order = response.data.data.order
           console.log("order",order)
           this.tableData = order
           this.tableList = order
           var total =  response.data.data.total
           this.total = total
+        }else{
+          loading.close()
         }
       }) 
     },

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

@@ -373,8 +373,15 @@ export default {
         page:this.page,
         storehouse_id:this.storehouse_id,
        }
+       const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+       })
       getDrugIndetail(params).then(response=>{
         if(response.data.state == 1){
+          loading.close()
           var drugInOrder = response.data.data.detail
           var drugTypeParent = response.data.data.drugTypeParent
           var obj = {id:0,storehouse_name:"全部"}
@@ -445,6 +452,8 @@ export default {
           this.tableList = list
           var total = response.data.data.total
           this.total = total
+        }else{
+          loading.close()
         }
       })
     },
@@ -539,13 +548,13 @@ export default {
      exportListDetail(){
        
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','数量','总价']
-       const filterVal = ['index','warehousing_order','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name','time','user_name','price','warehousing_count','total']
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','数量','总价']
+       const filterVal = ['index','warehousing_order','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name','number_batch','product_date_name','expiry_date_name','time','user_name','price','warehousing_count','total']
 
        var newArr = []
        newArr = this.cancelStockDate
        console.log("newArrwowowowoow",newArr)
-     
+      
        let obj = {'index':'合计','total':0}
        for(let i=0;i<newArr.length;i++){
           newArr.specification_name = ""
@@ -555,6 +564,10 @@ export default {
          newArr[i].manufacturer_name = this.getManufacturerName(newArr[i].manufacturer)
          newArr[i].dealer_name = this.getDealerName(newArr[i].dealer)
          newArr[i].time = this.getTime(newArr[i].ctime)
+         newArr[i].expiry_date_name = this.getTime(newArr[i].expiry_date)
+         newArr[i].product_date_name = this.getTime(newArr[i].product_date)
+         newArr[i].number_batch=""
+         newArr[i].number_batch=newArr[i].batch_number
          newArr[i].user_name = this.getAdminUser(newArr[i].creater)
          newArr[i].total = (newArr[i].price * newArr[i].warehousing_count).toFixed(2)
          obj.total += (newArr[i].price * newArr[i].warehousing_count)

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

@@ -9,7 +9,7 @@
       >打印
     </el-button>
      <el-button
-      v-if="org_id != 10265 && org_id!=0&&org_id!=10480"
+      v-if="org_id != 10265&&org_id!=10480"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetai"
@@ -25,7 +25,7 @@
       >明细导出
     </el-button>
     <el-button
-      v-if="org_id == 10480|| org_id == 0"
+      v-if="org_id == 10480"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetaiTwo"
@@ -456,13 +456,20 @@ export default {
          limit:this.limit,
          storehouse_id:this.storehouse_id,
       }
-      console.log("jajjfjajfjajfdj")
+      const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+       })
       getDrugOutDetail(params).then(response=>{
+       
         this.tableData = []
         this.tableList = []
         if(response.data.state == 1){
+          loading.close()
           var order = response.data.data.order
-          console.log("order233322332323223",order)
+          // console.log("order233322332323223",order)
 
           var obj = {id:0,storehouse_name:"全部"}
           this.houseList = []
@@ -610,6 +617,8 @@ export default {
           this.tableList = list
           var total = response.data.data.total
           this.total = total
+        }else{
+          loading.close()
         }
       })
     },
@@ -721,12 +730,12 @@ export default {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },
     exportListDetai(){
+      console.log("hwhhwhwhwhwhw",this.tableData)
+     
       import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','time','user_name','in_price','price','count','total_price']
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','number_bath','product_date_name','expiry_date_name','time','user_name','in_price','price','count','total_price']
 
-       console.log("hwhhwhwhwhwhw",this.tableData)
-       
        for(let i=0;i<this.tableData.length;i++){
          if(this.tableData[i].is_total == 0){
             this.tableData[i].index = i+1
@@ -763,9 +772,18 @@ export default {
               if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit ==this.tableData[i].min_unit){
                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
               }
+
+              this.tableData[i].number_bath =""
+              this.tableData[i].number_bath =  this.tableData[i].batch_number
+
+              this.tableData[i].expiry_date_name = this.getTime(this.tableData[i].expiry_date)
+
+              this.tableData[i].product_date_name = this.getTime(this.tableData[i].product_date)
             }
          }
        }
+      
+      
        const data = this.formatJson(filterVal, this.tableData)
 
 

src/xt_pages/stock/stockOutOrder.vue

@@ -2295,7 +2295,7 @@ export default {
           "warehouse_out_time",
           "good_name",
           "good_type_id",
-          "unit",
+          "specification_name",
           "count",
           "price",
           "total_price",

src/xt_pages/user/doctorAdvice.vue

@@ -102,6 +102,8 @@
           </ul>
         </div>
       </div>
+     
+
       <div class="cell clearfix">
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
@@ -2276,7 +2278,9 @@ export default {
         keywords: "",
         id: 0,
         limit: 10,
-        page: 1
+        page: 1,
+        delivery_way:0,
+        delivery_way_one:""
       },
       total: 0,
       addLoading: false,
@@ -2306,10 +2310,15 @@ export default {
       drug_id: 0,
       src_type:"",
       org_id:0,
-     
+      deliveryWay:[],
+    
     };
   },
   methods: {
+    selectDeliveryWay(val){
+       this.listQuery.delivery_way = val
+       this.getList()
+    },
     clickuseradvicecell(row, column, cell, event) {
       // console.log("row1", row);
       // console.log("column", column);
@@ -3524,6 +3533,16 @@ export default {
       };
     },
     getList() {
+      //  var name = ""
+      //   for(let i=0;i<this.deliveryWay.length;i++){
+      //       if(this.listQuery.delivery_way == this.deliveryWay[i].id){
+      //         name = this.deliveryWay[i].name
+      //       }
+      //   }
+      //   if(name == '全部'){
+      //     name = ""
+      //   }
+      //  this.listQuery.delivery_way_one = name
       getDoctorAdviceList(this.listQuery).then(response => {
         if (response.data.state == 1) {
           this.adviceTableData = response.data.data.advices;
@@ -4506,6 +4525,10 @@ export default {
           this.deliveryWayOptions =
             response.data.data.drugways === null? []: response.data.data.drugways;
           this.executionFrequencyOptions = response.data.data.efs === null ? [] : response.data.data.efs;
+          // var dics  =  response.data.data.dics
+          // var obj = {id:0,name:"全部"}
+          // this.deliveryWay.push(obj)
+          // this.deliveryWay.push(...dics)
         }
       });
     },

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