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

src/api/config.js

@@ -202,3 +202,11 @@ export function changePrescriptionConfig(params) {
     params: params
   })
 }
+
+export function changeDrugOpenConfig(params) {
+  return request({
+    url: '/api/changedrugopenconfig',
+    method: 'get',
+    params: params
+  })
+}

src/api/dialysis.js

@@ -291,3 +291,11 @@ export function GetDialysisGoodStatistics(params) {
 
   })
 }
+
+export function changeRole(params) {
+  return request({
+    url: '/api/get/getrolelist',
+    method: 'get',
+    params: params
+  })
+}

src/api/his/advice.js

@@ -23,3 +23,27 @@ export function updatePharmacyBaseDrug(params) {
     params: params
   })
 }
+
+export function SaveSetting(params) {
+  return request({
+    url: '/api/advice/savesetting',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getPharmacyConfig(params) {
+  return request({
+    url: '/api/advice/getpharmacyconfig',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getUserdDrugList(params) {
+  return request({
+    url: '/api/advice/getpharmacybasedruglist',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/hospitalCharges.js

@@ -40,7 +40,7 @@ export default {
       path: '/hospitalCharges/summary',
       component: () => import('@/xt_pages/hospitalStation/summary'),
       name: 'summary',
-      meta: { title: 'summary', noCache: true }
+      meta: { title:'summary', noCache: true }
     },
     {
       path: '/hospitalCharges/chargeDetailManagement',

src/utils/request.js

@@ -6,23 +6,23 @@ import store from '@/store'
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
-  timeout: 60000, // request timeout
+  timeout: 30000, // request timeout
   withCredentials: true
 })
 
 // request interceptor
-service.interceptors.request.use(config => {
+// service.interceptors.request.use(config => {
 //   Do something before request is sent
-  if (store.getters.token) {
+//   if (store.getters.token) {
 //     让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
-    config.headers['token_cookie'] = ""
-  }
-  return config
-}, error => {
+//     config.headers['X-Token'] = getToken()
+//   }
+//   return config
+// }, error => {
 //   Do something with request error
-  console.log(error) // for debug
-  Promise.reject(error)
-})
+//   console.log(error) // for debug
+//   Promise.reject(error)
+// })
 
 // respone interceptor
 service.interceptors.response.use(

src/views/layout/Layout.vue

@@ -12,10 +12,10 @@
           <i class="iconfont icon-s_bingli navIcon"></i>
           <p>电子病历</p>
         </div>
-         <div v-if="medicianshow" :class="index == 7 ? 'navOne navActive' : 'navOne'" @click="clickActive(7,'药房管理')">
+         <!-- <div v-if="medicianshow" :class="index == 7 ? 'navOne navActive' : 'navOne'" @click="clickActive(7,'药房管理')">
           <i class="iconfont icon-shangcheng-1 navIcon"></i>
           <p>药房管理</p>
-        </div>
+        </div> -->
         <div v-if="touxiShow" :class="index == 2 ? 'navOne navActive' : 'navOne'" @click="clickActive(2,'透析管理')">
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -79,6 +79,7 @@
             border
             style="width: 100%"
             highlight-current-row
+            @current-change="handleSelectionChangeOne"
             ref="singleTable"
           >
             <el-table-column prop="name" label="名称" width="100">
@@ -101,11 +102,9 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          <el-button type="primary" @click="dispense" v-if="state == 1"
-            >发药</el-button
-          >
+          <el-button type="primary" @click="dispense" v-if="state == 1">发药</el-button>
           <el-button type="primary" @click="toPrint">打印</el-button>
-          <el-button type="primary" v-if="state == 1">设置</el-button>
+          <el-button type="primary" @click="toSetting">设置</el-button>
         </div>
         <el-divider></el-divider>
         <div>
@@ -115,6 +114,60 @@
             border
             style="width: 1328px"
             @selection-change="handleSelectionChange"
+             v-if="state == 1"
+          >
+            >
+            <el-table-column type="selection" width="55"> </el-table-column>
+            <el-table-column type="index" label="序号" width="120" align="center">
+              <template slot-scope="scope">
+                {{scope.$index + 1}}
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="患者名称" width="180" align="center">
+                <template slot-scope="scope">
+                 {{getPatientName(scope.row.patient_id)}}
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="单次用量" width="170" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.single_dose}}
+               </template>
+            </el-table-column>
+            <el-table-column prop="name" label="用法" width="160" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.delivery_way}}
+               </template>
+            </el-table-column>
+            <el-table-column prop="name" label="频率" width="160" align="center">
+                <template  slot-scope="scope">
+                 {{scope.row.execution_frequency}}
+               </template>
+            </el-table-column>
+            <el-table-column prop="name" label="天数" width="160" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.day}}
+               </template>
+            </el-table-column>
+            <el-table-column prop="name" label="总量" width="160" align="center">
+                <template  slot-scope="scope">
+                 {{scope.row.prescribing_number}}
+               </template>
+            </el-table-column>
+            <el-table-column prop="name" label="数据来源" width="162" align="center">
+                <template  slot-scope="scope">
+                 <span v-if="scope.row.type == 1">血透</span>
+                 <span v-if="scope.row.type == 2">HIS</span>
+               </template>
+            </el-table-column>
+          </el-table>
+
+
+            <el-table
+            :height="tableHeight"
+            :data="tableList"
+            border
+            style="width: 1328px"
+            v-if="state == 2"
           >
             >
             <el-table-column type="selection" width="55"> </el-table-column>
@@ -160,9 +213,38 @@
                </template>
             </el-table-column>
           </el-table>
+
+
+        </div>
+        <div style="margin-top">领料人：
+          <el-select v-model="admin_user_id" placeholder="请选择">
+            <el-option
+              v-for="item in doctorList"
+              :key="item.admin_user_id"
+              :label="item.user_name"
+              :value="item.admin_user_id">
+            </el-option>
+           </el-select>
         </div>
-        <div style="margin-top">诊断时间：2022-05-07 19:22:16</div>
       </div>
+
+      <el-dialog
+        title="设置"
+        :visible.sync="dialogVisible"
+        width="30%">
+        <span>请选择药品是否要通过药房管理出库</span>
+        <span>
+          <el-radio v-model="is_open" label="1">是</el-radio>
+          <el-radio v-model="is_open" label="2">否</el-radio>
+        </span>
+        <span>
+          若选择为是，则通过药房发药的药品都会在发药之后进行出库，否则按原来的方式进行出库管理
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="SaveSetting">确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
 
     <drug-print
@@ -178,7 +260,7 @@
 <script>
 import drugPrint from "./print/drugPrint.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug } from "@/api/his/advice";
+import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug,SaveSetting,getPharmacyConfig,getUserdDrugList } from "@/api/his/advice";
 const moment = require('moment')
 export default {
   components: {
@@ -198,10 +280,17 @@ export default {
       alreadmount: 0,
       tableData: [],
       tableData_list: [],
+      tableList:[],
       multipleSelection: [],
       start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
       patientList:[],
       keywords:"",
+      dialogVisible:false,
+      is_open:"2",
+      isVisibility:"",
+      propsTable:"",
+      doctorList:[],
+      admin_user_id:this.$store.getters.xt_user.user.id,
     };
   },
 
@@ -217,17 +306,49 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-
+    handleSelectionChangeOne(val){
+      this.tableList = []
+      this.getUserlist(val.id)
+    },
     // 药品发药
     dispense() {
-      var params = {};
+      var blood_ids = []
+      var his_ids = []
+      var bloodStr = ""
+      var hisStr = ""
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.tableData[i].type == 1){
+          blood_ids.push(this.tableData[i].id)
+        }
+        if(this.tableData[i].type == 2){
+          his_ids.push(this.tableData[i].id)
+        }
+      }
+      bloodStr = blood_ids.join(",")
+      hisStr =  his_ids.join(",")
+      var params = {
+        bloodStr:bloodStr,
+        hisStr:hisStr,
+        admin_user_id:this.admin_user_id,
+      }
       this.$confirm("确定是否对该药品进行发药?", "患者发药", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {})
-        .catch(() => {});
+      }).then(() => {
+        updatePharmacyBaseDrug(params).then(response=>{
+           if(response.data.state == 1){
+           var msg = response.data.data.msg
+           var medical =  response.data.data.medical
+           if(msg === 1){
+             this.$message.success("发药成功!")
+           }
+           if(msg == 2 || msg ===3){
+             this.$message.error("库存不足")
+           }
+         }
+        })
+      }).catch(() => {});
     },
 
     // 药品退药
@@ -255,6 +376,8 @@ export default {
            var list =  response.data.data.list
            this.$refs.singleTable.setCurrentRow(list[0])
            this.tableData = list
+           var doctorlist = response.data.data.doctorlist
+           this.doctorList = doctorlist
          }
       }) 
     }, 
@@ -320,6 +443,50 @@ export default {
        }
        return name
     },
+    toSetting(){
+      getPharmacyConfig().then(response=>{
+        if(response.data.state == 1){
+           this.dialogVisible = true
+           var config = response.data.data.config
+           this.is_open = config.is_open.toString()
+        }
+      })
+    },
+    SaveSetting(){
+      var params = {
+        is_open:parseInt(this.is_open),
+      }
+     SaveSetting(params).then(response=>{
+       if(response.data.state == 1){
+         var config = response.data.data.config
+         this.$message.success("保存成功!")
+         this.dialogVisible = false
+       }
+     })
+    },
+    getUserlist(drug_id){
+       var params = {
+        start_time:this.start_time,
+        drug_id:drug_id,
+      }
+      getUserdDrugList(params).then(response=>{
+       if(response.data.state == 1){
+           var advicelist = response.data.data.advicelist
+           for(let i=0;i<advicelist.length;i++){
+             advicelist[i].type = 1
+             advicelist[i].day = " "
+             this.tableList.push(advicelist[i])
+           }
+           var hisAdviceList = response.data.data.hisAdviceList
+           for(let i=0;i<hisAdviceList.length;i++){
+             hisAdviceList[i].type = 2
+             this.tableList.push(hisAdviceList[i])
+           }
+           var patient = response.data.data.patient
+           this.patientList = patient
+        }
+      })
+    }
   },
   created() {
     this.getlist()

src/xt_pages/data/basicConfig.vue

@@ -39,6 +39,9 @@
             <p style="margin-top:20px;">耗材先出库再执行：
                 <el-switch v-model="is_open_is_type" @change="changeFuncType"></el-switch>
             </p>
+            <!-- <p style="margin-top:20px;">药品在保存处方时出库：
+                <el-switch v-model="drug_out_open" @change="changeDrugOpen"></el-switch>
+            </p> -->
         </div>
 
 
@@ -94,7 +97,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -115,6 +118,7 @@ export default {
       is_open_is_type:false,
       is_open_advice_xt_his:false,
       is_open_prescription_xt_his:false,
+      drug_out_open:false,
     };
   },
   methods: {
@@ -154,6 +158,12 @@ export default {
               this.is_open_prescription_xt_his = false
             }
 
+            if(response.data.data.is_open == 1){
+              this.drug_out_open = true
+            }else{
+              this.drug_out_open = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -376,6 +386,25 @@ export default {
             this.$message.success("保存成功!")
           }
       })
+    },
+    changeDrugOpen(){
+      var drug_out_open = 0
+      if(this.drug_out_open == false){
+        drug_out_open = 2
+      }
+      if(this.drug_out_open == true){
+        drug_out_open = 1
+      }
+      var params = {
+        drug_out_open:drug_out_open,
+      }
+      changeDrugOpenConfig(params).then(response=>{
+        if(response.data.state == 1){
+           var msg =  response.data.data.msg
+           this.$message.success("保存成功!")
+        }
+      })
+
     }
 
   },

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

@@ -1636,10 +1636,15 @@
           this.$message.error('你没有执行医嘱的权限')
           return false
         }
+
+        console.log("王哈",this.currentRow)
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id ==10340 ){
+           if(this.currentRow.checker == 0){
+              this.$message.error("请先核对医嘱")
+              return
+           }
+        }
         this.execTimeDialogVisible = true
-        // if (this.currentAdvices.length <= 0) {
-        //   return;
-        //  }
         if (this.current_select_object == 1) {
           var isExecution = true
           var adviceArr = this.advice_groups[this.current_group_index].advices
@@ -2085,6 +2090,7 @@
         }
       },
       cellMouseEnter: function(row, column, event) {
+        console.log("row323323322323233232",row)
         this.currentRow = row
         this.groupSelectRow = row
         // this.sameRowArr.forEach((arr, i) => {

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

@@ -162,8 +162,21 @@
       if (this.form.puncture_nurse_id == 0) {
         this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
       }
+     
+      if(this.form.change_nurse == 0){
 
-
+         this.form.change_nurse = this.$store.getters.xt_user.user.id
+      }
+      
+      if(this.form.washpipe_nurse == 0){
+        this.form.washpipe_nurse =  this.$store.getters.xt_user.user.id
+      }
+      if(this.form.difficult_puncture_nurse == 0){
+        this.form.difficult_puncture_nurse =  this.$store.getters.xt_user.user.id
+      }
+      if(this.form.new_fistula_nurse == 0){
+        this.form.new_fistula_nurse = this.$store.getters.xt_user.user.id
+      }
     },
     watch: {
       patient:{
@@ -182,6 +195,7 @@
         this.form.change_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.change_nurse
         this.form.difficult_puncture_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id:this.dialysis_order.difficult_puncture_nurse
         this.form.new_fistula_nurse = this.dialysis_order.id ==0?this.$store.getters.xt_user.user.id:this.dialysis_order.new_fistula_nurse
+
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1

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

@@ -128,7 +128,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="第二核对人员工号:" isShowFiled label-width="140px">
+      <el-form-item label="第二核对人员工号:" v-if="isShowFiled('第二核对人员工号')" label-width="150px">
         <el-input style="width:200px" v-model="doubleReview.employee_number"></el-input>
       </el-form-item>
 
@@ -151,7 +151,7 @@
 </template>
 
 <script>
-  import { postDoubleCheck } from '@/api/dialysis'
+  import { postDoubleCheck,changeRole } from '@/api/dialysis'
   import { uParseTime } from '@/utils/tools'
   import { parseTime } from '@/utils'
   import { getDataConfig } from '@/utils/data'
@@ -209,6 +209,8 @@
         dialysate_flow:"透析液流量:",
         blood_access_part_opera_id:"通路类型:",
         displace_liqui_value:"置换液总量:",
+        job_number:"",
+        org_id:0,
       }
     }, 
     methods: {
@@ -262,8 +264,7 @@
           //   this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
           // }
           this.first_check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
-          console.log( this.first_check_time )
-          console.log( this.check_time )
+          
 
         }
       },
@@ -307,15 +308,16 @@
         if(this.check_time){
           ParamsQuery['check_time'] = this.record_date + ' ' + this.check_time
         }
-        // ParamsQuery['check_time'] = this.record_date + ' ' + this.check_time
+        
         if(this.first_check_time){
           ParamsQuery['first_check_time'] = this.record_date + ' ' + this.first_check_time
         }
         
         ParamsQuery['creater'] = this.doubleReview.creater
         ParamsQuery['modifier'] = this.doubleReview.modifier
-
-
+            
+    
+       
         postDoubleCheck(ParamsQuery).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -341,7 +343,6 @@
            
 
             let doublecheck_resp = response.data.data.doubleCheck
-            console.log("处方233232323232232332",this.prescription)
             var doubleCheck = this.double_check
             for (var index in doublecheck_resp) {        
               this.$set(doubleCheck, index, doublecheck_resp[index])
@@ -550,7 +551,6 @@
          
          var arr = []
          var str = val.join(';')
-         console.log("strw222222222",str)
         if(str.indexOf('透析器/灌流器')!=-1 && this.prescription!=null){
             arr.push("透析器/灌流器:"+(this.prescription.dialyzer_perfusion_apparatus?this.prescription.dialyzer_perfusion_apparatus:""))
         }
@@ -586,7 +586,7 @@
         if(str.indexOf('钙')!=-1 && this.prescription==null ){
           arr.push("钙:")
         }
-        console.log("arr",arr)
+    
         this.doubleReview.dialysis_item_desc = arr.join(";")
         if(val.length > 0){
           this.doubleReview.dialysis_item_check = 2
@@ -684,7 +684,6 @@
         if(str.indexOf("置换液总量")!=-1 && this.prescription == null){
            arr.push("置换液总量:")
         }
-        console.log("arr",arr)
         this.doubleReview.dialysis_parameter_desc = arr.join(";")
         if(val.length>0){
           this.doubleReview.dialysis_parameter_check = 2
@@ -719,7 +718,6 @@
           if(str.indexOf('滑脱')!=-1){
              arr.push("滑脱:")
           }
-        console.log("arr",arr)
         this.doubleReview.vascular_access_desc = arr.join(";")
         if(val.length>0){
           this.doubleReview.vascular_access_verification = 2
@@ -790,7 +788,6 @@
 
       GetDialysateFormulationById(val) {
          this.dialysate_formulation_options = getDataConfig('hemodialysis','dialysate_formulation')
-         console.log("透析液配方",this.dialysate_formulation_options)
         
         let name = ''
         let dfl = this.dialysate_formulation_options.length
@@ -932,7 +929,6 @@
      getDisplace(id){
        var name = ""
        var arr = this.$store.getters.displace_liqui
-       console.log("arr233233233223",arr)
        for(let i=0;i<arr.length;i++){
         if(id == arr[i].id){
           name = arr[i].name
@@ -940,6 +936,17 @@
        }
        return name
      },
+     changeRole(admin_user_id){
+        var params = {
+          admin_user_id:admin_user_id,
+        }
+       changeRole(params).then(response=>{
+         if(response.data.state == 1){
+           var role = response.data.data.adminRole
+           this.job_number = role.job_number
+         }
+       })
+     }
     },
 
     props: {
@@ -1084,7 +1091,7 @@
           if(this.prescription.displace_liqui_value!=""){
             this.displace_liqui_value = "置换液总量:"
             this.displace_liqui_value = this.displace_liqui_value + this.prescription.displace_liqui_value
-            console.log("置换液总量",this.displace_liqui_value)
+          
           }
         
         }
@@ -1194,7 +1201,7 @@
            if(this.double_check.pipeline_connection_desc.indexOf("管路打折")!=-1){
              this.checkListThree.push("管路打折")
            }
-           console.log("hhh",this.checkListOne)
+      
         }
       }, 
       'double_check.id': function() {
@@ -1268,7 +1275,8 @@
      
       var date = this.$route.query && this.$route.query.date
       this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
-
+      this.org_id = this.$store.getters.xt_user.org.id
+     
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       var nowMonth = nowDate.getMonth() + 1

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

@@ -38,7 +38,7 @@
           <el-input v-model="form.catheter" @focus="showInnerDialog('4')" style="width:200px"></el-input>
         </el-form-item>
 
-        <el-form-item label="透析器凝血: ">
+        <el-form-item label="透析器凝血: " v-if="isShowFiled('透析器凝血')">
           <el-input
             style="width:200px"
             v-model="form.cruor"
@@ -256,7 +256,7 @@
         ParamsQuery["nurse"] = this.form.nurse_id;
         ParamsQuery["end_time"] = this.end_time;
         ParamsQuery["mode"] = "2"
-        ParamsQuery["puncture_point_haematoma"] = this.form.puncture_point_haematoma
+        ParamsQuery["puncture_point_haematoma"] = paseInt(this.form.puncture_point_haematoma)
         ParamsQuery["internal_fistula"] = this.form.internal_fistula
         ParamsQuery["catheter"] = this.form.catheter
         ParamsQuery["cruor"] = this.form.cruor
@@ -284,7 +284,7 @@
       submit: function() {
         this.loading = true
         let mode = "1"
-        finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,this.form.puncture_point_haematoma,this.form.internal_fistula,this.form.catheter,this.form.cruor).then(rs => {
+        finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,parseInt(this.form.puncture_point_haematoma),this.form.internal_fistula,this.form.catheter,this.form.cruor).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1011,16 +1011,20 @@
             v-if="org_template_info.template_id == 42"
           >
           </DialysisPrintOrderFortyTwo>
+
+        
           <DialysisPrintOrderFortyThree
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 43"
           >
           </DialysisPrintOrderFortyThree>
+
           <DialysisPrintOrderFortyFour
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 44"
           >
           </DialysisPrintOrderFortyFour>
+
           <DialysisPrintOrderFortyFive
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 45"
@@ -1375,14 +1379,13 @@ export default {
       const style9 =
         '@media print {#dialysis-print-box-1{margin:0 auto;}.dialysis-print-order{width:920px;margin:0 10px;font-size:10px;}.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 940px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}@page {margin-top:5px;}.table-box1 tr {border-bottom: 1px solid #000;}';
       const style10 =
-        '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px}   .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
 
       // 三明曙光样式
       const style11 =
         '@media print {.dialysis-print-order{width:960px;margin:100px auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:30px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:15px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       // 漳浦天福样式
-      const style12 =
-        '@media print {.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}';
+      const style12 ='@page {margin-top:5px;}@media print {.dialysis-print-order{width:960px;margin:0 auto} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({
@@ -1667,7 +1670,7 @@ export default {
         printJS({
           printable: "dialysis-print-box",
           type: "html",
-          style: style10,
+          style: style2,
           scanStyles: false,
         });
       } else if (this.org_template_info.template_id == 43) {

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyTwo.vue

@@ -187,18 +187,6 @@
                     </div>
                     <div class="inline_block" style="margin-left:10px;flex:1;">
                       穿刺方式：
-                      <!-- <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
-                        /
-                      </div>
-                      <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 1">
-                        绳梯
-                      </div>
-                      <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 2">
-                        扣眼
-                      </div>
-                      <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 3">
-                        区域
-                      </div> -->
                       <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == ''">
                         /
                       </div>
@@ -211,6 +199,12 @@
                       <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('区域')>-1">
                         区域
                       </div>
+                      <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('顺穿')>-1">
+                        顺穿
+                      </div>
+                      <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('反穿')>-1">
+                        反穿
+                      </div>
                     </div>
                     <div class="inline_block" style="margin-left:10px;flex:1;">
                       穿刺针：
@@ -548,8 +542,7 @@
                         <td width="50">血流量<br />(ml/min)</td>
                         <td width="50">静脉压<br />({{monitors[0]&&monitors[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</td>
                         <td width="50">跨膜压<br />({{monitors[0]&&monitors[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</td>
-                        <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
-                        <td width="60" v-if="org_id == 9836">体温(°C)</td>
+                        <td width="60">透析液温度(°C)</td>
                         <td width="50">电导度<br />(ms/cm)</td>
                         <td width="50">超滤量<br />(ml)</td>
                         <td v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12" width="50">

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -216,7 +216,7 @@
           // {value: 2, label: '银行卡'},
           // {value: 3, label: '微信'},
           // {value: 4, label: '支付宝'},
-          { value: 5, label: '医保卡' },
+          { value: 4, label: '医保卡' },
 
         ],
         total: "",

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -13,7 +13,7 @@
 
     <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="org_id != 10217 && org_id != 9675 && org_id != 9671 && org_id != 0 &&org_id != 10164"
+        v-if="org_id != 10217 && org_id != 9675 && org_id != 9671 && org_id != 0 &&org_id != 10164 && org_id == 10188"
         ref="printOne"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -23,7 +23,7 @@
       ></printOne>
       <printTwo
         v-if="
-          org_id == 10217 || org_id == 0 || org_id == 9675 || org_id == 9671 || org_id == 10164
+          org_id == 10217 || org_id == 0 || org_id == 9675 || org_id == 9671 || org_id == 10164 ||org_id == 10188
         "
         ref="printTwo"
         v-bind:childResponse="childResponse"

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -11,7 +11,7 @@
           style="width: 150px; margin-left: 10px"
           @change="changeItem"
         >
-          <el-option label="全部" value=0> </el-option>
+          <el-option label="全部" value="0"> </el-option>
           <el-option
             v-for="(item, index) in items"
             :key="index"
@@ -330,14 +330,7 @@ export default {
 
           var new_arr = [];
 
-          let list_1 = this.$store.getters.pagedata.list;
-          if (list_1.keywords == undefined) {
-            this.keywords = "";
-          } else {
-            this.keywords = list_1.keywords;
-          }
-          this.id = list_1.type_id;
-          this.item_type = this.id
+          
 
           if (this.keywords != "") {
             for (let i = 0; i < this.tableData.length; i++) {
@@ -443,7 +436,7 @@ export default {
           act_pay += this.list[i].orders[j].acct_pay;
         }
       }
-      return act_pay.toFixed(2)
+      return act_pay.toFixed(2);
     },
     getFundPaySumamt() {
       var fund_pay_sumamt = 0;
@@ -528,8 +521,17 @@ export default {
     },
   },
   created() {
-    this.org_id = this.$store.getters.xt_user.org.id;
-    console.log("org_id233232323232",this.org_id)
+    let list_1 = this.$store.getters.pagedata.list;
+          if (list_1.start_time == "") {
+            this.chargeDate[0] = "";
+          } else {
+            this.chargeDate[0] = list_1.start_time;
+          }
+           if (list_1.end_time == "") {
+            this.chargeDate[1] = "";
+          } else {
+            this.chargeDate[1] = list_1.end_time;
+          }
     this.start_time = this.chargeDate[0];
     this.end_time = this.chargeDate[1];
     this.getHisSummaryDetailList();

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -1246,6 +1246,17 @@ export default {
     },
   },
   created() {
+    let list_1 = this.$store.getters.pagedata.list;
+          if (list_1.start_time == "") {
+            this.chargeDate[0] = "";
+          } else {
+            this.chargeDate[0] = list_1.start_time;
+          }
+           if (list_1.end_time == "") {
+            this.chargeDate[1] = "";
+          } else {
+            this.chargeDate[1] = list_1.end_time;
+    }
     this.start_time = this.chargeDate[0];
     this.end_time = this.chargeDate[1];
     this.tableList = [];

src/xt_pages/role/components/AdminInfoForm.vue

@@ -74,6 +74,11 @@
         <el-input v-model="form.doctor_number"></el-input>
        </el-form-item>
     </el-col>
+    <el-col :span="8">
+       <el-form-item label="工号:">
+           <el-input v-model="form.job_number" style="width:180px;"></el-input>
+       </el-form-item>
+    </el-col>
    </el-row>
   
   <div v-show="show">
@@ -203,11 +208,7 @@
         
        </el-form-item>
     </el-col>
-     <el-col :span="8">
-       <el-form-item label="工号:">
-           <el-input v-model="form.job_number" style="width:180px;"></el-input>
-       </el-form-item>
-    </el-col>
+   
     <el-col :span="8">
        <el-form-item label="处方资格标志:">
            <el-select v-model="form.prescription_qualification_identification" placeholder="处方资格标志" style="width:180px;">

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

@@ -159,26 +159,17 @@
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-           <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span> 
-           <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
-           <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
-           <span v-if ="org_id!=9919 && org_id!=10210 && org_id!=9671">
-             <!-- <span v-if="scope.row.price >0">
-                <span v-if="scope.row.count_unit == scope.row.min_unit">
-                  {{(scope.row.price * scope.row.count).toFixed(2)}}
-                </span>  
-                <span v-if="scope.row.count_unit == scope.row.max_unit">{{(scope.row.price * scope.row.count * scope.row.min_number).toFixed(2)}}</span>
-              </span>
-             <span v-if="scope.row.price  == 0">
-               <span v-if="scope.row.count_unit  == scope.row.min_unit">
-                 {{((getPrice(scope.row.drug_id)* scope.row.count)).toFixed(2)}}
-               </span> 
-               <span v-if="scope.row.count_unit == scope.row.max_unit">
-                 {{(getPrice(scope.row.drug_id)* scope.row.count * scope.row.min_number).toFixed(2)}}
-              </span>
-             </span> -->
-             {{scope.row.total_price}}
-           </span>
+            <span v-if="scope.row.is_total !=1">
+              <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span> 
+              <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
+              <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
+              <span v-if ="org_id!=9919 && org_id!=10210 && org_id!=9671">
+                 {{scope.row.total_price}}
+               </span>
+            </span>
+            <span v-if="scope.row.is_total == 1">
+              {{scope.row.total_price}}
+            </span>
           </template>
         </el-table-column>
       </el-table>
@@ -437,10 +428,11 @@ export default {
                order[i].total_price = order[i].count * order[i].last_price
                total_price += order[i].count * order[i].last_price
              }else{
+               console.log("555555555555",order[i])
                if(order[i].price > 0){
+                console.log("近来33232323322323")
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                    order[i].total_price = order[i].count * order[i].price
-                  total_price += order[i].total_price
                  }
                  if(order[i].count_unit == order[i].max_unit){
                    if(order[i].is_sys == 0){
@@ -449,12 +441,15 @@ export default {
                      order[i].total_price += order[i].count * order[i].price * order[i].min_number
                    }
                  }
+
+                total_price += order[i].total_price
                 
                }
+
                if(order[i].price ==0 ){
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                     order[i].total_price = order[i].count * this.getPrice(order[i].drug_id)
-                   total_price +=order[i].total_price
+                  
                     order[i].price = this.getPrice(order[i].drug_id)
                  }
                 
@@ -466,13 +461,13 @@ export default {
                    }
                    order[i].price = this.getPrice(order[i].drug_id)
                 }
-                 
+                total_price +=order[i].total_price
                } 
                
              }
             
           }
-         
+           console.log("toal_p3232332332233232",total_price)
            order.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
@@ -487,6 +482,7 @@ export default {
        
           console.log("233223322323322332232323",order)
           this.tableData = order
+
            let objInfo = {}
           order.forEach((item,index)=>{
              let { drug_id } = item
@@ -579,7 +575,7 @@ export default {
           this.tablePrint[i].index = i+1
         }
         for(let i=0;i<this.tablePrint.length;i++){
-           if(this.org_id == 9919 ){
+           if(this.org_id == 9919){
            
              this.tablePrint[i].count = this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child)
              this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
@@ -699,11 +695,9 @@ export default {
          end_time:this.end_time,
          order_type:2,
       }  
-     
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){
             var list = response.data.data.list
-          
             let objInfo = {}
             if(this.org_id == 9919){
               list.forEach((item,index)=>{
@@ -726,9 +720,9 @@ export default {
                   min_price:item.XtBaseDrug.min_price,
                 }
               }
-            })
+             })
             }else{
-               list.forEach((item,index)=>{
+             list.forEach((item,index)=>{
               let { drug_id } = item
               if(!objInfo[drug_id]){
                 objInfo[drug_id] = {

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -523,7 +523,7 @@ export default {
           this.list = response.data.data.list;
           this.doctorList = response.data.data.doctorList;
           
-          this.doctorList.push({index:"999",user_name:"护士站", admin_user_id:"999"})
+          // this.doctorList.push({index:999,user_name:"护士站", admin_user_id:999})
         
         }
         loading.close();

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,6 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
+        <div v-if="org_id!=9671 && org_id!=10210">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -58,8 +59,77 @@
              </tr>
             </tbody>
           </table>
+          <div v-if="orgId != 10024" style="display:flex;margin-top:1px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
+          <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
+            <div style="width:50px;">科室：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
+            <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
+            <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
+            <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
+          </div>
+        </div>
+      </div> 
+
 
+      <div v-if="org_id == 9671 || org_id == 10210">
+       <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
+         <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
+          <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
 
+          <div style="float: left;margin-bottom: 1px;">单据编号：{{it.warehouse_out_order_number}}</div>
+          <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="230">药品名称</td>
+              <td style="line-height: 50px" width="230">规格型号</td>
+              <td style="line-height: 50px" width="80">出货数量</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height:50px" width="80">出库价格</td>
+              <td style="line-height: 50px" width="80">总价</td>
+              <td style="line-height: 50px" width="80">批号</td>
+              <td style="line-height: 50px" width="80">生产日期</td>
+              <td style="line-height: 50px" width="80">有效日期</td>
+            </tr>
+
+            <tr v-for="(item,i) in it.xt_drug_warehouse_out_info" :key="i">
+              <td style="line-height: 50px">
+                <span>{{item.drug.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                  <span>{{item.drug.dose}}{{item.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
+              </td>
+              <td style="line-height: 50px">
+                  {{item.count}}
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.count_unit}}</span>
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+             <td  style="line-height:50px">
+                {{(item.count * item.price).toFixed(2)}}
+             </td>
+             <td>{{item.batch_number}}</td>
+             <td>{{(getTime(item.product_date))}}</td>
+             <td>{{(getTime(item.expire_date))}}</td>
+            </tr>
+             <tr>
+               <td style="line-height:50px">合计</td>
+               <td colspan="7"></td>
+               <td>{{getTotalPrince(it.xt_drug_warehouse_out_info).toFixed(2)}}</td>
+             </tr>
+            </tbody>
+          </table>
           <div v-if="orgId != 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
             <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
@@ -77,6 +147,7 @@
           </div>
         </div>
 
+       </div>
       </div>
 
     </div>
@@ -133,7 +204,8 @@
         manufactureList:[],
         tableList:[],
         loading:false,
-        warehouseList:[]
+        warehouseList:[],
+        tableData:[],
       }
     },
     methods: {
@@ -175,25 +247,25 @@
             const params = {
             'id': order_id
             };
-            getDrugWarehouseOutInfo(params).then(response => {
-            if (response.data.state == 0) {
+     getDrugWarehouseOutInfo(params).then(response => {
+        if (response.data.state == 0) {
 
-                this.$message.error(response.data.msg);
-                return false
-            } else {
-              for (let i = 0; i < response.data.data.list.length; i++) {
-                this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
-               }
-               var total_price = 0;
-               for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
-                 total_price += this.warehousingOutInfo.warehousingOutData[i].count * this.warehousingOutInfo.warehousingOutData[i].price
-               }
-               this.allPrice = total_price;
-               this.warehousingOutInfo.info = response.data.data.info;
-               this.handleSpanTempArr()
+            this.$message.error(response.data.msg);
+            return false
+        } else {
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
-            })
-        },
+            var total_price = 0;
+            for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
+              total_price += this.warehousingOutInfo.warehousingOutData[i].count * this.warehousingOutInfo.warehousingOutData[i].price
+            }
+            this.allPrice = total_price;
+            this.warehousingOutInfo.info = response.data.data.info;
+            this.handleSpanTempArr()
+        }
+      })
+     },
         getList() {
         let params = {
           page: this.page,
@@ -213,7 +285,7 @@
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
-            console.log("list222222",this.list)
+           
           }
         })
       },
@@ -265,7 +337,6 @@
         getDrugWarehouseOrderInfo().then(response=>{
            if(response.data.state == 1){
              var list =  response.data.data.list
-             console.log("入库单详情",list)
              this.drugOrderList = list
            }
         })
@@ -315,9 +386,7 @@
         getDrugOutOrderDetailPrint(params).then(response=>{
           if(response.data.state ==1){
              var info = response.data.data.info
-             console.log("info",info)
             var warehousing = response.data.data.warehousing
-            console.log("ware2232",warehousing)
             this.warehouseList = warehousing
           
             for(let i=0;i<info.length;i++){
@@ -330,10 +399,11 @@
             }
             
             var manufacturerList = response.data.data.manufacturerList
-            console.log("manufacturelist",manufacturerList)
+           
             this.manufactureList = manufacturerList
-            console.log("列表",info)
+
             this.tableList = info
+            this.tableData = response.data.data.drug_warhouse_out
             this.loading = false
           }
         })
@@ -346,7 +416,14 @@
           }
         }
         return count
-      }
+      },
+      getTotalPrice(val){
+        var count = 0
+        for(let i=0;i<val.length;i++){
+           count +=val[i].count * val[i].price
+          }
+         return count.toFixed(2)
+        }
     },
     created() {
       this.orgName = this.$store.getters.xt_user.org.org_name;

src/xt_pages/stock/inventory.vue

@@ -320,6 +320,7 @@ export default {
               this.total = total
               this.doctorList =  response.data.data.doctorlist
               this.houseList = response.data.data.houseList
+              console.log("仓库行吗32323232232332",this.houseList)
               var houseConfig = response.data.data.houseConfig
               this.storehouse_id = houseConfig.storehouse_out_info
               }