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

src/xt_pages/data/components/addDrugs.vue

@@ -606,6 +606,8 @@
           total:"",
           specification_name:"",
           is_user:"2",
+          sum_count:"",
+          sum_in_count:"",
         },
 
         rules: {
@@ -721,6 +723,7 @@
         this.form.intro = ''
       },
       show(id, obj) {
+        console.log("obj3223323232332",obj)
         this.unitList = []
         this.packingUnit = []
         var arr =  getDataConfig('hemodialysis','units')
@@ -889,9 +892,6 @@
         form['drug_dose_unit'] = this.form.drug_dose_unit
         form['medical_insurance_number'] = this.form.medical_insurance_number
         form['provinces_code'] = this.form.provinces_code
-
-
-
         form['manufacturer'] = this.form.manufacturer
         form['pharmacology_category'] = this.form.pharmacology_category
         form['statistics_category'] = this.form.statistics_category
@@ -930,6 +930,8 @@
         form['prescribing_number_unit'] = this.form.prescribing_number_unit
         form['specification_name'] = this.form.specification_name
         form['is_user'] = this.form.is_user
+        form['sum_count'] = this.form.sum_count
+        form['sum_in_count'] = this.form.sum_in_count
         return form
       },
       getlist() {

src/xt_pages/data/components/drugs.vue

@@ -529,7 +529,8 @@
           val['id'] = this.current_id;
 
           val.min_number =  parseInt(val.min_number)
-
+          console.log("Val323323232",val)
+          
           editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -720,7 +721,7 @@
               if(this.formValue.drug_classify == 0){
                  this.formValue.drug_classify = ""
               }
-
+             
 
 
               this.$refs.addDrugs.show(id, this.formValue)
@@ -1198,7 +1199,7 @@
             if (results[i]['默认给药途径'] === undefined) {
                 obj['delivery_way'] = ''
               } else {
-            if (key == '经销商') {
+            if (key == '默认给药途径') {
                 obj['delivery_way'] = results[i][key].replace(/\s/g,"")
               }
            }

src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue

@@ -707,7 +707,7 @@
                                 <td width="80">钠浓度(ml/h)/<br />温度(°C)</td>
                                 <td width="50">脉搏<br />(次/分)</td>
                                 <td width="60">血压<br />(mmHg)</td>
-                                <td width="50">血容量</td>
+                                <td width="50">血容量<br />(L)</td>
                                 <td width="50">签名</td>
                                 <td width="200">病情变化及处理</td>
                                 </tr>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -2,6 +2,7 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+    
       <template v-if="this.template_id == 1">
         <el-button
           size="small"
@@ -97,8 +98,7 @@
           :disabled="selecting_schs.length == 0"
           @click="batchPrintAction"
           type="primary"
-          >打印</el-button
-        >
+          >打印</el-button>
       </template>
       <template v-if="this.template_id == 7">
         <el-button
@@ -708,6 +708,7 @@ export default {
         } else {
           var template = response.data.data.template;
           this.template_id = template.template_id;
+          console.log("templage-i233232323232322323233232323223",this.template_id)
         }
       });
     },

src/xt_pages/dialysis/details/NavIgation.vue

@@ -555,7 +555,7 @@ export default {
   },
   methods: {
     getUnReadNum: function() {
-      console.log("医嘱中国23322222222222222222222222222",this.doctor_advices)
+     
       let doctorAdvice = [];
       for (let y = 0; y < this.doctor_advices.length; y++) {
         if (this.doctor_advices[y].execution_state == 2) {

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

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

@@ -791,8 +791,12 @@
         this.lastPredialysisEvaluation = last_predialysis_evaluation
        
        
-        console.log("获取上次数据",this.lastPredialysisEvaluation)
+        console.log("获取上次数据",this.lastPredialysisEvaluation, this.$store.getters.xt_user.org.id )
         if(this.lastPredialysisEvaluation != null) {
+        // if(this.lastPredialysisEvaluation.remark == "" && this.$store.getters.xt_user.org.id == 10307){
+        //     console.log("2o2o3232o23o2o3o23")
+        //     this.assessmentBeforeDislysis.remark = "患者已确认无发热,无流行病学接触史"
+        // } 
          if(this.lastPredialysisEvaluation.thromubus_type == 1){
           this.assessmentBeforeDislysis.thromubus_type = this.lastPredialysisEvaluation.thromubus_type.toString()
            this.thrombuShow = true
@@ -822,6 +826,7 @@
           if(this.lastPredialysisEvaluation.period == 2){
              this.lastPredialysisEvaluation.period = "2"
           }
+         
         }
 
 
@@ -1298,6 +1303,7 @@
       }
     },
     created() {
+  
       this.last_dialysis_after = getDataConfig('hemodialysis', 'last_dialysis_after')
       this.dialysis_interphase = getDataConfig('hemodialysis', 'dialysis_duration')
       this.symptom_before_dialysis = getDataConfig('hemodialysis', 'dialysis_before')

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

@@ -8,12 +8,8 @@
                 :append-to-body="true"
                 class="newDialog"
         >
-            <el-button
-                    style="position: absolute;left: 12%;top: 2%"
-                    @click="handlePatientInfo"
-            >{{ patient.name }}
-            </el-button
-            >
+            <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo">{{ patient.name }}</el-button>
+            <!-- <el-button style="position: absolute;left: 20%;top: 2%" @click="handlePatientInfoOne">上机打印单 </el-button> -->
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
                     ref="dialysisPrescription"
@@ -956,6 +952,70 @@
       </span>
         </el-dialog>
 
+
+        <el-dialog
+                :title="patient.name"
+                :visible.sync="startVisibility"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                :show-close="false"
+                width="30%"
+        >
+         <el-button
+            size="small"
+            icon="el-icon-printer"
+            type="primary"
+            @click="printAction"
+            style="float:right"
+            >打印</el-button
+          >
+       <div id="print_content">
+        <div class="print_main_content">
+          <div class="table_panel">
+              <div class="signPrint" style="font-size:16px;">
+                <div style="margin-left:50px;">姓名:
+                  <span>{{ patient.name }} </span>
+                  （{{patient.dialysis_no }}，{{patient.age}}岁）
+                </div>
+                <div class="printCell">
+                  <span>
+                    床号：{{schedual.device_number.number}}
+                    <span style="width:auto;" v-if="schedual.schedule_type == 1">上午</span>
+                    <span style="width:auto;" v-if="schedual.schedule_type == 2">下午</span>
+                    <span style="width:auto;" v-if="schedual.schedule_type == 3">晚上</span>
+                  </span>
+                  <span> </span>
+                </div>
+                <div class="printCell">
+                  <span>干体重：{{getDryWeight()}}Kg</span>
+                  <span>抗凝剂：
+                     {{dialysisPrescription.anticoagulant}}
+                  </span>
+                </div>
+                <div class="printCell">
+                  <span>净重值：Kg</span>
+                  <span>首剂：{{dialysisPrescription.anticoagulant}}</span>
+                </div>
+                <div class="printCell">
+                  <span>体重增加：Kg</span>
+                  <span>维持：</span>
+                </div>
+                <div class="printCell">
+                  <span>处方脱水量：{{dialysisPrescription.target_ultrafiltration}}</span>
+                  <span>总量：</span>
+                </div>
+              </div>
+         
+          </div>
+        </div>
+      </div>
+
+            <span slot="footer" class="dialog-footer">
+        <el-button @click="cancleMsgOne()">取 消</el-button>
+        <el-button type="primary" @click="cancleMsgOne()">确 定</el-button>
+      </span>
+    </el-dialog>
+
         <multi-select-box
                 :propsForm="InnerDialogProps"
                 v-on:dialog-comfirm="innerDialogComfirm"
@@ -972,7 +1032,7 @@
   import { calculateAnticoagulantZL, uParseTime } from '@/utils/tools'
   import store from '@/store'
   import MsgTip from './MsgTip'
-
+  import print from 'print-js'
   import request from '@/utils/request'
   import multiSelectBox from './MultiSelectBox'
 
@@ -1239,7 +1299,7 @@
         blood_access_option: [],
         is_pre: 0,
         msgtip_visibility: false,
-
+        startVisibility:false,
         dialysisPrescription: {
           replacement_total: '',
           mode_id: '',
@@ -3406,10 +3466,18 @@
         this.isVisibility = false
         this.msgtip_visibility = true
       },
+      handlePatientInfoOne(){
+        this.isVisibility = false
+        this.startVisibility = true
+      },
       cancleMsg() {
         this.isVisibility = true
         this.msgtip_visibility = false
       },
+      cancleMsgOne(){
+       this.isVisibility = true
+       this.startVisibility = false
+      },
       getPermission() {
         request
           .get('/api/func_per/get', {
@@ -3454,7 +3522,18 @@
       unique(arr) {
         const res = new Map()
         return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1))
-      }
+      },
+      printAction: function() {
+        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 180px;} @page {margin-top:10px;}}'
+        const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 170px;} @page {margin-top:10px;}}'
+        printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style1,
+          scanStyles: false
+        }) 
+      },
 
     },
 
@@ -3963,10 +4042,11 @@
         this.irrigations = irrigation
         console.log('透析器', this.dialyzers)
         console.log('灌流器', this.irrigations)
-      }
+      },
+   
     },
     created() {
-
+      console.log("schedual232323323232323232",this.schedual)
       this.illnessList = getDataConfig('hemodialysis', 'illness')
 
       this.plasmaSeparatorList = getDataConfig('hemodialysis', 'plasma_separator')

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -440,7 +440,6 @@ export default {
     this.getAllZone();
     this.getTemplateInfo();
     this.requestSchedualDoctors(this.time)
-    // this.template_id = this.$store.getters.xt_user.template_info.template_id;
     this.org_id = this.$store.getters.xt_user.template_info.org_id;
   },
   methods: {
@@ -470,13 +469,11 @@ export default {
 
       this.schedulType = scheduleType;
       this.listQuery.schedul_type = scheduleType;
-      console.log("班次",this.listQuery.schedul_type)
       this.requestSchedualDoctors(this.time);
     },
     selectPartitionType(partitionType) {
       this.partitionType = partitionType;
       this.listQuery.partition_type = partitionType;
-      console.log("分区",this.listQuery.partition_type)
       this.requestSchedualDoctors(this.time);
     },
 
@@ -522,23 +519,22 @@ export default {
          var schedule_type = this.listQuery.schedul_type
          var partition_type = this.listQuery.partition_type
 
-        console.log("班次",schedule_type,"分区",partition_type)
         getSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
             var schedules = resp.data.scheduals
-            console.log("列表数据",schedules)
+         
             var config = resp.data.config
-            console.log("config222222",config.is_open)
+           
             let project_config = resp.data.project_config
-            console.log('project_config',)
+            
             if(project_config.is_open == 1){
               this.project = resp.data.project
               console.log( this.project)
              
               let projectArr = []
-              if(this.org_id !=9671 && this.org_id!= 10318){
+              if(this.org_id!= 10318){
                 this.project.map(item => {
                   resp.data.hisAdvices.map(it => {
                     if(item.patient_id == it.patient_id){
@@ -546,14 +542,15 @@ export default {
                     }
                   })
                 })
-               
+                
                  resp.data.hisAdvices.map((item,index) => {
                   if(projectArr[index].project && projectArr[index].project.length > 0){
-                    projectArr[index].project.map(it => {
+                     projectArr[index].project.map(it => {
+                     
                       let obj = {
                         advice_doctor: it.doctor,
                         start_time:it.start_time,
-                        advice_name:it.team_id > 0 && it.is_check_team == 1 ? it.team.project_team : it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                        advice_name:it.team_id > 0 && it.is_check_team == 1 ? it.team.project_team : it.type == 2 ? it.project.project_name+' '+it.count + it.project.unit : it.good_info.good_name +' '+it.count+ it.good_info.packing_unit,
                         execution_time:it.execution_time,
                         execution_state:it.execution_state,
                         execution_staff:it.execution_staff,
@@ -575,10 +572,10 @@ export default {
                 })
               }
             
-              console.log(projectArr)
+             
 
             }
-            console.log('resp.data.hisAdvices',resp.data.hisAdvices)
+           
            if(config.is_open == 0 || config.is_open == 2){
             this.show = true
             this.showOne = false
@@ -602,7 +599,7 @@ export default {
                     arr.push(it)
                 })
             })
-            console.log("班次3333333",this.schedulType)
+           
             if(this.schedulType == 0){
                 newSchedules = arr
             }else{
@@ -613,7 +610,7 @@ export default {
                 })
             }
 
-            console.log("分区",this.partitionType)
+           
             if(this.partitionType == 0){
                 this.scheduleMap = newSchedules
             }else {
@@ -625,7 +622,7 @@ export default {
                 })
                 this.scheduleMap = a
             }
-            console.log("列表22222",this.scheduleMap)
+
             this.scheduleMap.map(ele => {
                 let firstIndex = this.scheduleMap.findIndex(item => {
                   return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
@@ -642,10 +639,11 @@ export default {
             this.indexInfoList = newArr
            }
            if(config.is_open == 1){
+           
              this.show = false
              this.showOne  = true
             var schedules =  resp.data.hisAdvices
-            console.log("hhhhhhhh22323232323232",schedules)
+           
             let arr = []
             let newArr = []
             let newSchedules = []
@@ -688,7 +686,7 @@ export default {
                 })
                 this.scheduleMap = a
             }
-            console.log('333333344444',this.scheduleMap)
+ 
             this.scheduleMap.map(ele => {
                 let firstIndex = this.scheduleMap.findIndex(item => {
                   return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
@@ -705,8 +703,9 @@ export default {
             this.indexInfoList = newArr
            }
          }
-         console.log("列表22222",this.indexInfoList)
+         
         })
+        
     },
     getValue: function(val) {
       if (val != undefined) {

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -839,15 +839,16 @@
               {{ monitor.temperature ? monitor.temperature : "" }}
             </span>
           </td>
+          
+
           <td>
             <span v-if="getTime(monitor.operate_time) != ''">
-              {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
+              {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
             </span>
           </td>
-
           <td>
             <span v-if="getTime(monitor.operate_time) != ''">
-              {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
+              {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
             </span>
           </td>
 

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -641,7 +641,7 @@
                         <td width="80">钠浓度(ml/h)/<br />温度(°C)</td>
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="60">血压<br />(mmHg)</td>
-                        <td width="50">血容量</td>
+                        <td width="50">血容量<br />L</td>
                         <td width="50">签名</td>
                         <td width="200">病情变化及处理</td>
                       </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1190,7 +1190,9 @@
                         </td>
                         <td width="60" v-if="org_id != 9836">透析液温度(°C)</td>
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
-                        <td width="50">电导度<br />(ms/cm)</td>
+
+                        <td width="50" v-if="org_id != 10121 && org_id != 9675&& org_id != 0">电导度<br />(ms/cm)</td>
+                        <td width="50" v-if="org_id == 10121|| org_id == 9675|| org_id == 0">SpO₂<br />(%)</td>
                         <td width="50">超滤量<br />(ml)</td>
                         <td
                           v-if="
@@ -1302,7 +1304,9 @@
                         <td v-if="org_id == 9836">
                           {{ monitor.temperature ? monitor.temperature : "" }}
                         </td>
-                        <td v-if="org_id != 9538">
+
+
+                        <td v-if="org_id != 9538 && org_id != 10121 && org_id != 9675&& org_id != 0">
                           {{ monitor.conductivity ? monitor.conductivity : "" }}
                         </td>
                         <td v-if="org_id == 9538">
@@ -1312,10 +1316,18 @@
                               : ""
                           }}
                         </td>
+                        <td v-if="org_id == 10121|| org_id == 9675|| org_id == 0">
+                          {{
+                            monitor.blood_oxygen_saturation
+                              ? monitor.blood_oxygen_saturation
+                              : ""
+                          }}
+                        </td>
                         <td
                           v-if="
                             (dialysisOrder &&
                               monitor.operate_time > dialysisOrder.end_time) ||
+
                             (dialysisOrder &&
                               monitor.operate_time < dialysisOrder.start_time)
                           "

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -842,8 +842,8 @@
               <p style="height: 20px; line-height: 20px">ml</p>
             </th>
             <th style="width: 70px">
-              <p style="height: 20px; line-height: 20px">Kt/V</p>
-              <p style="height: 20px; line-height: 20px">ml</p>
+              <p style="height: 20px; line-height: 20px">KT/V</p>
+              <p style="height: 20px; line-height: 20px">&nbsp;</p>
             </th>
             <th style="width: 40px">
               <p style="height: 20px; line-height: 20px">T</p>

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2427,7 +2427,8 @@ export default {
                             child: [],
                             sum_count:item.drug.sum_count,
                             out_count:0,
-                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit
+                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit,
+                            is_user:item.drug.is_user,
                           };
                         }
                       });
@@ -2455,12 +2456,15 @@ export default {
 
                       if(newArr.length > 0){
                         for(let i=0;i<newArr.length;i++){
-                          if(newArr[i].out_count > newArr[i].sum_count){
-                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
-                            isLoading = false
-                            this.$emit('editKeepLoad', false)
-                            return
-                          }
+                           if(newArr[i].is_user!=1){
+                             if(newArr[i].out_count > newArr[i].sum_count){
+                              this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                              isLoading = false
+                              this.$emit('editKeepLoad', false)
+                              return
+                             }
+                           }
+                       
                         }
                       }
                       console.log("newArr",newArr )
@@ -2485,7 +2489,8 @@ export default {
                             child: [],
                             sum_count:item.drug.sum_count,
                             out_count:0,
-                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit
+                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit,
+                            is_user:item.drug.is_user,
                           };
                         }
                       });
@@ -2525,12 +2530,15 @@ export default {
 
                       if(newArr.length > 0){
                         for(let i=0;i<newArr.length;i++){
-                          if(newArr[i].out_count > newArr[i].sum_count){
-                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
-                            isLoading = false
-                            this.$emit('editKeepLoad', false)
-                            return
+                          if(newArr[i].is_user!=1){
+                            if(newArr[i].out_count > newArr[i].sum_count){
+                              this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                              isLoading = false
+                              this.$emit('editKeepLoad', false)
+                              return
+                            }
                           }
+                        
                         }
                       }
                       console.log("newArr",newArr )
@@ -2925,7 +2933,9 @@ export default {
       //     return
       //   }
       // }
-       if (row.sum_count <= 0) {
+    
+      if(row.is_user!=1){
+        if (row.sum_count <= 0) {
           if (selection) {
             selection.forEach(row => {
               if (row.sum_count <= 0) {
@@ -2938,6 +2948,8 @@ export default {
           this.$message.error(row.drug_name + '库存不足')
           return
        }
+      }
+
       this.curDrugs = selection
     },
 

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -466,13 +466,19 @@
         }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
-          if (scope.row.prescribing_number > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+            if (scope.row.prescribing_number > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
+         
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+            if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
+        
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
 
@@ -510,13 +516,19 @@
       },
       changePrescribingNumber(scope) {
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+           if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+           }
           }
+        
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+            if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
+         
         }
       },
       getProjectSingleDose(scope) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2432,7 +2432,7 @@
                             sum_count:item.drug.sum_count,
                             out_count:0,
                             str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit,
-
+                            is_user:item.drug.is_user,
                           };
                         }
                       });
@@ -2472,12 +2472,15 @@
 
                       if(newArr.length > 0){
                         for(let i=0;i<newArr.length;i++){
-                          if(newArr[i].out_count > newArr[i].sum_count){
-                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
-                            isLoading = false
-                            this.$emit('editKeepLoad', false)
-                            return
+                          if(newArr[i].is_user!=1){
+                            if(newArr[i].out_count > newArr[i].sum_count){
+                              this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                              isLoading = false
+                              this.$emit('editKeepLoad', false)
+                              return
+                            }
                           }
+                         
                         }
                       }
                       console.log("newArr",newArr )
@@ -2502,7 +2505,8 @@
                             child: [],
                             sum_count:item.drug.sum_count,
                             out_count:0,
-                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit
+                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit,
+                            is_user:item.drug.is_user,
                           };
                         }
                       });
@@ -2530,12 +2534,15 @@
                       console.log("new233223322323",newArr)
                       if(newArr.length > 0){
                         for(let i=0;i<newArr.length;i++){
-                          if(newArr[i].out_count > newArr[i].sum_count){
-                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
-                            isLoading = false
-                            this.$emit('editKeepLoad', false)
-                            return
+                          if(newArr[i].is_user!=1){
+                            if(newArr[i].out_count > newArr[i].sum_count){
+                              this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                              isLoading = false
+                              this.$emit('editKeepLoad', false)
+                              return
+                            }
                           }
+                        
                         }
                       }
                       console.log("newArr",newArr )
@@ -2903,7 +2910,7 @@
         this.$refs.additionalCharges.show()
       },
       selectDrugs(selection, row) {
-        //console.log("row233232233232",row)
+        console.log("row233232233232",row)
         // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
         //     if (row.count <= 0) {
         //       if (selection) {
@@ -2933,8 +2940,9 @@
         //       return
         //     }
         // }
-
-        if (row.sum_count <= 0) {
+        
+        if(row.is_user!=1){
+          if (row.sum_count <= 0) {
           if (selection) {
             selection.forEach(row => {
               if (row.sum_count <= 0) {
@@ -2947,7 +2955,7 @@
           this.$message.error(row.drug_name + '库存不足')
           return
          }
-
+        }
         this.curDrugs = selection
       },
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -436,6 +436,7 @@
 
       },
       getAllChange(scope) {
+        console.log("scope23322332233232",scope)
         // if (this.prescription.is_medicine_status){
         //   this.$message.error('该处方已经结算或记账，无法删除')
         //
@@ -500,13 +501,19 @@
         }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
-          if (scope.row.prescribing_number > scope.row.drug.sum_count) {
+          if(scope.row.drug.is_user!=1){
+           if (scope.row.prescribing_number > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
+           }
           }
+
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+          if(scope.row.drug.is_user!=1){
+           if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
+           }
           }
+
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
 
@@ -602,13 +609,19 @@
 
 
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+            if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
+
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+            if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
+
         }
       },
       getProjectSingleDose(scope) {

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -168,9 +168,9 @@
       <div>总费用:{{ getAllPice() }}</div>
       <div>
         个人支付: 
-       
-        <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>  
-        <span v-if="his_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
+        {{getActPay()}}
+        <!-- <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>  
+        <span v-if="his_patient.balance_accounts_type != 2">{{ getActPay() }}</span> -->
       
       </div>
       <div>基金支付记账:{{ getFundPaySumamt() }}</div>
@@ -444,12 +444,25 @@ export default {
       return total_price.toFixed(2);
     },
     getActPay() {
+      var arrNew = []
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
-          act_pay += this.list[i].orders[j].psn_cash_pay;
+          //个人支付
+          console.log("is",this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 0){
+             arrNew.push(this.list[i].orders[j])
+          }
+        }
+      }
+      if(arrNew.length > 0){
+        for(let i=0;i<arrNew.length;i++){
+           for(let j=0;j<arrNew[i].order_info.length;j++){
+             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
+           }
         }
       }
+      console.log("arrNew2332323223",arrNew)
       return act_pay.toFixed(2);
     },
     getFundPaySumamt() {

src/xt_pages/outpatientTool/detailPrint.vue

@@ -19,29 +19,27 @@
             <td>患者姓名：{{ patient.name }}</td>
             <td>性别：{{ patient.gender == 1 ? "男" : "女" }}</td>
             <td>结算类别：
-          <!-- {{ getType(his_patient.balance_accounts_type) }} -->
-          {{getType(his_record_patient.balance_accounts_type)}}</td>
+            <span v-if="his_patient!=null&&his_patient.balance_accounts_type >0"> {{ getType(his_patient.balance_accounts_type) }} </span>
+            <span v-if="his_record_patient!=null&&his_record_patient.balance_accounts_type >0">{{getType(his_record_patient.balance_accounts_type)}}</span></td>
             <td>发票号码：{{order.fa_piao_number}}</td>
           </tr>
           <tr>
             <td>住院/门诊号：
-          <!-- {{his_patient.number}} -->
-          {{his_record_patient.ipt_otp_no}}</td>
+          <span v-if="his_patient!=null && his_patient.number!=''">{{his_patient.number}}</span>
+          <span v-if="his_record_patient!=null && his_record_patient.ipt_otp_no!=''">{{his_record_patient.ipt_otp_no}}</span></td>
             <td>科室：
-          <!-- {{ getDepartment(his_patient.departments) }} -->
-          {{ getDepartment(his_record_patient.departments) }}</td>
+          <span v-if="his_patient!=null && his_patient.departments >0"> {{ getDepartment(his_patient.departments) }}</span> 
+          <span v-if="his_record_patient!=null && his_record_patient.departments > 0">{{ getDepartment(his_record_patient.departments) }}</span></td>
             <td>就诊流水号：
-          <!-- {{ his_patient.number }} -->
-          {{his_record_patient.number}}</td>
+          <span v-if="his_patient!=null && his_patient.number!=''"> {{ his_patient.number }}</span>
+          <span v-if="his_record_patient!=null && his_record_patient.number!=''">{{his_record_patient.number}}</span></td>
           </tr>
           <tr>
             <td>总费用：{{ getAllPice() }}</td>
             <td>个人支付：
-          <!-- <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
-          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span> -->
-          
-          <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
-          <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
+             {{getActPay()}}
+            <!-- <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
+            <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span> -->
             </td>
             <td>基金支付记账：{{ getFundPaySumamt() }}</td>
             <td>补充医疗支付记账：{{ getHifesPay() }}</td>
@@ -394,12 +392,27 @@ export default {
       }
       return total_price;
     },
-    getActPay(){
-      var act_pay = 0
-      for(let i=0;i<this.orderList.length;i++){
-         act_pay += this.orderList[i].psn_part_amt
+    getActPay() {
+      var arrNew = []
+      var act_pay = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        for (let j = 0; j < this.list[i].orders.length; j++) {
+          //个人支付
+          console.log("is",this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 0){
+             arrNew.push(this.list[i].orders[j])
+          }
+        }
+      }
+      if(arrNew.length > 0){
+        for(let i=0;i<arrNew.length;i++){
+           for(let j=0;j<arrNew[i].order_info.length;j++){
+             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
+           }
+        }
       }
-      return act_pay.toFixed(2)
+      console.log("arrNew2332323223",arrNew)
+      return act_pay.toFixed(2);
     },
     getFundPaySumamt() {
       var fund_pay_sumamt = 0;

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -53,7 +53,7 @@
         <div class="listInfo" style="margin-bottom: 20px;">
             <div>记账支付：{{getFundPaySumamt()}}</div>
             <div>个人账号：{{getAcctPay()}}</div>
-            <div>现金支付：{{getPsnCashPay()}}</div>
+            <div>现金支付：{{getActPay()}}</div>
         </div>
         <table class="listTable" border="1">
             <tr>
@@ -145,6 +145,7 @@
           his_record_patient:{},
           orderList:[],
           org_id:0,
+          list:[],
         }
     },
     methods:{
@@ -195,8 +196,9 @@
           this.drugTypeList =response.data.data.drugTypeList
           this.costClassifyList = response.data.data.costClassifyList 
           var list = response.data.data.list
+          this.list = list
           this.orderList = response.data.data.orderList
-
+          console.log("orderlist23323223",this.orderList)
           var new_arr = []
 
           for(let i=0;i<list.length;i++){
@@ -659,7 +661,7 @@
       if(total_price > 0){
         return total_price.toFixed(2)
       }else{
-        return total_price
+        return "0.00"
       }
      
     },
@@ -1080,38 +1082,62 @@
       }
     },
     getPsnCashPay(){
-      var psn_cash_pay = 0
+      var psn_cash_pay = 0.00
       for(let i=0;i<this.orderList.length;i++){
         psn_cash_pay += this.orderList[i].psn_cash_pay
       }
       if(psn_cash_pay > 0){
          return psn_cash_pay.toFixed(2)
       }else{
-        return 0.00
+        return "0.00"
       }
     },
     getAcctPay(){
-      var acct_pay = 0
+      var acct_pay = 0.00
       for(let i=0;i<this.orderList.length;i++){
          acct_pay +=this.orderList[i].acct_pay
       }
       if(acct_pay > 0){
         return acct_pay.toFixed(2)
       }else{
-        return 0.00
+        return "0.00"
       }
     },
     getFundPaySumamt(){
-      var fund_pay_sumamt = 0
+      var fund_pay_sumamt = 0.00
       for(let i=0;i<this.orderList.length;i++){
         fund_pay_sumamt +=this.orderList[i].fund_pay_sumamt
       }
+     
       if(fund_pay_sumamt >0){
         return fund_pay_sumamt.toFixed(2)
       }else{
-        return 0.00
+      
+        return "0.00"
       }
-    }
+    },
+    getActPay() {
+      var arrNew = []
+      var act_pay = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        for (let j = 0; j < this.list[i].orders.length; j++) {
+          //个人支付
+          console.log("is",this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 0){
+             arrNew.push(this.list[i].orders[j])
+          }
+        }
+      }
+      if(arrNew.length > 0){
+        for(let i=0;i<arrNew.length;i++){
+           for(let j=0;j<arrNew[i].order_info.length;j++){
+             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
+           }
+        }
+      }
+      console.log("arrNew2332323223",arrNew)
+      return act_pay.toFixed(2);
+    },
 
     },
     created(){

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -177,7 +177,8 @@ export default {
         { value: 0, label: '全部', source: 0, lapseto: 0 },
         { value: 1, label: '转出', source: 0, lapseto: 2 },
         { value: 2, label: '留治', source: 0, lapseto: 1 }
-      ],originType:0,
+      ],
+      originType:0,
       originState: [
         { value: 0, label: '全部', source: 0},
         { value: 2, label: '住院', source: 2},
@@ -693,10 +694,10 @@ export default {
           var countwo = response.data.data.countwo
 
           var systolicTotal = response.data.data.systolicTotal
-          console.log('systolictotal', systolicTotal)
+          
           var sysstandTotal = 0
           var systolic = response.data.data.systolic
-          console.log('systolic', systolic)
+
           var sysarr = []
           for (let i = 0; i < systolic.length; i++) {
             if (systolic[i].systolic_blood_pressure >= this.sysmin && systolic[i].systolic_blood_pressure <= this.syslarge) {
@@ -704,20 +705,20 @@ export default {
             }
           }
           sysstandTotal = sysarr.length
-          console.log('sysarr', sysarr)
+       
 
           var diastotal = response.data.data.diastotal
           var diasstandtotal = 0
 
           var diastolic = response.data.data.diastolic
-          // console.log("diastolic",diastolic)
+          
           var diaArr = []
           for (let i = 0; i < diastolic.length; i++) {
             if (diastolic[i].diastolic_blood_pressure >= this.diamin && diastolic[i].diastolic_blood_pressure <= this.dialarge) {
               diaArr.push(diastolic[i])
             }
           }
-          // console.log("diaArr",diaArr)
+         
           diasstandtotal = diaArr.length
           var normData = response.data.data.normData
 
@@ -761,9 +762,10 @@ export default {
               }
             }
           }
-
+          console.log("count23322322332",count)
+          console.log("normdate23233323",normData)
           var arrtwo = this.arrayDate(count, normData)
-
+          console.log("23323332323232323223",arrtwo)
           for (let i = 0; i < arrtwo.length; i++) {
             this.$set(arrtwo[i], 'Count', 0)
           }
@@ -778,6 +780,8 @@ export default {
             arr.push(item)
           })
           arr.sort(this.compare('sort'))
+           console.log("wwowwoowwowo",this.normData)
+           console.log("arr23323323332",arr)
 
           for (const key in this.normData) {
             this.modesData.xAxis.push(this.normData[key].item_name)
@@ -787,6 +791,7 @@ export default {
               this.modesData.series.push(0)
             }
           }
+          
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
           this.getArrLength(this.chart.xAxis.data)
@@ -810,15 +815,20 @@ export default {
         var obj = array2[i]
         var num = obj.inspection_minor   //staff_id   就是要对比的key
         var isExist = false
+
         for (var j = 0; j < array1.length; j++) {
           var aj = array1[j]
+          
           var n = aj.item_id
+         
           if (n == num) {
             isExist = true
             break
           }
         }
+       
         if (!isExist) {
+          
           result.push(obj)
         }
       }

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -768,11 +768,14 @@ export default {
       },
 
     exportList(){
+      console.log("shij232333",this.tableOut)
+     
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
+        this.tableOut[i].ctime = this.getTime(this.tableOut[i].ctime)
         if(this.orgId == 9919){
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
@@ -809,9 +812,9 @@ export default {
         }
        }
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','出库时间','备注']
 
-       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','ctime','remark']
 
        const data = this.formatJson(filterVal, this.tableOut)
 

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

@@ -570,9 +570,10 @@ export default {
     },
 
      exportList(){
-
+      
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
+          this.tablePrint[i].ctime = this.getTime(this.tablePrint[i].ctime)
         }
         for(let i=0;i<this.tablePrint.length;i++){
            if(this.org_id == 9919){
@@ -591,8 +592,8 @@ export default {
 
 
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','remark']
+       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','出库时间','备注']
+       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','ctime','remark']
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tablePrint.length;i++){
          obj.total_price += this.tablePrint[i].total
@@ -701,6 +702,7 @@ export default {
      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)=>{
@@ -721,6 +723,7 @@ export default {
                   min_number:item.XtBaseDrug.min_number,
                   max_unit:item.XtBaseDrug.max_unit,
                   min_price:item.XtBaseDrug.min_price,
+                  ctime:item.ctime,
                 }
               }
              })
@@ -743,6 +746,7 @@ export default {
                   min_number:item.XtBaseDrug.min_number,
                   max_unit:item.XtBaseDrug.max_unit,
                   min_price:item.XtBaseDrug.min_price,
+                  ctime:item.ctime,
                 }
               }
             })

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -104,6 +104,11 @@
             {{ scope.row.price }}
           </template>
         </el-table-column>
+         <el-table-column prop="remake" label="备注" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
       </el-table>
 
       <el-pagination

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -273,6 +273,7 @@ export default {
             min_price:0,
             drug_id:0,
             storehouse_id:0,
+            houseList:[],
         }
     },
     methods:{

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -1404,7 +1404,7 @@ export default {
       getExportOutOrderDrugList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
-          // console.log("list22222", list);
+        
           this.exportList = list;
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
@@ -1412,11 +1412,12 @@ export default {
       });
     },
     toExport() {
+     
       if (this.order_id == "") {
         this.$message.error("请勾选出库单");
         return;
       }
-      // console.log("hh2323232322323", this.exportList);
+     
       for (let i = 0; i < this.exportList.length; i++) {
         if (this.exportList[i].dealer == 0) {
           this.exportList[i].dealer = "";
@@ -1454,6 +1455,7 @@ export default {
             this.exportList[i].dealer = this.dealerList[z].dealer_name;
           }
         }
+        this.exportList[i].ctime = this.getTime(this.exportList[i].ctime)
       }
 
       import("@/vendor/Export2Excel").then((excel) => {
@@ -1478,6 +1480,7 @@ export default {
           "有效日期",
           "经销商",
           "批准文号",
+          "出库时间",
           "备注",
         ];
         const filterVal = [
@@ -1494,6 +1497,7 @@ export default {
           "expiry_date",
           "dealer",
           "number",
+          "ctime",
           "remark",
         ];
 

src/xt_pages/stock/drugs/print.vue

@@ -37,11 +37,12 @@
                         <td>{{item.warehousing_unit}}</td>
                         <td>{{getNumber(item.id)}}</td>
                         <td>{{item.manufacturer}}</td>
-                        <td>{{item.storehouse_id}}</td>
+                        <td>{{getHouseName(item.storehouse_id)}}</td>
                         <td> 
                             <span v-if="item.stock_max_number>0">{{item.stock_max_number}}{{item.warehousing_unit}} </span>  
                             <span v-if="item.stock_min_number>0">{{item.stock_min_number}}{{item.min_unit}}</span>
-                            <span v-if="item.stock_max_number == 0 && item.stock_min_number == 0">0</span></td>
+                            <span v-if="item.stock_max_number == 0 && item.stock_min_number == 0">0</span>
+                        </td>
                         <td>
                             <span v-if="item.last_stock_max_number > 0">{{item.last_stock_max_number}}{{item.warehousing_unit}}</span>  
                             <span v-if="item.last_stock_min_number>0">{{item.last_stock_min_number}}{{item.min_unit}}</span>
@@ -52,7 +53,15 @@
                           <span v-if="item.inventory_type == 11">盘亏</span>  
                         </td>
                         <td>{{getPrice(item.id)}}</td>
-                        <td>{{getTotalPrice(item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id,item.stock_max_number,item.stock_min_number)}}</td>
+                      
+                        <td v-if="item.inventory_type ==11">
+                          <span>{{getCount(item.stock_max_number,item.stock_min_number,item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id)}}</span>
+                        </td>
+
+                        <td v-if="item.inventory_type ==10">
+                          <span>{{getCountOne(item.stock_max_number,item.stock_min_number,item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id)}}</span>
+                        </td>
+                        <td v-if="item.inventory_type!=10 && item.inventory_type!=11"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -67,6 +76,7 @@ const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
 import { getInventoryDetailList } from "@/api/drug/drug"
 import print from "print-js";
+import { min } from 'moment';
 export default {
     components:{
         BreadCrumb
@@ -120,7 +130,7 @@ export default {
               this.tableData = response.data.data.list
               this.houseList = response.data.data.houseList
               this.inventoryList = response.data.data.inventoryList
-              console.log("hhahhh2o2o233oo2332",this.inventoryList)
+              console.log("hhahhh2o2o233oo2332",this.tableData)
               
              }
           })   
@@ -144,34 +154,101 @@ export default {
           }
           return number
          },
-         getTotalPrice(last_stock_max_number,last_stock_min_number,min_number,id,stock_max_number,stock_min_number){
-           var retail_price = 0
-           var totail_price =0
+         getPrice(id){
+           var price = 0
            for(let i=0;i<this.inventoryList.length;i++){
             if(id == this.inventoryList[i].id){
-              retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+               price = this.inventoryList[i].drug_warehouse_info.price
             }
           }
-          var totail_price = (stock_max_number*min_number +stock_min_number - last_stock_max_number * min_number + last_stock_min_number) * retail_price
-        //  var totail_price = last_stock_max_number * min_number * retail_price + last_stock_min_number * retail_price 
-          if(totail_price > 0){
-             return totail_price.toFixed(4)
-          }else{
-            return ""
+          if(price > 0){
+          return price
           }
+          
          },
-         getPrice(id){
-           var retail_price = 0
-           for(let i=0;i<this.inventoryList.length;i++){
-            if(id == this.inventoryList[i].id){
-               retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
-            }
+         getHouseName(id){
+         var storehouse_name = ""
+         for(let i=0;i<this.houseList.length;i++){
+           if(id == this.houseList[i].id){
+              storehouse_name = this.houseList[i].storehouse_name
+           }
+         }
+         if(storehouse_name == "全部"){
+           return ""
+         }else{
+           return storehouse_name
+         }
+       },
+       getCount(stock_max_number,stock_min_number,last_stock_max_number,last_stock_min_number,min_number,id){
+         
+         var cha_count = 0
+         var befor_total_count = 0
+         var after_total_count = 0
+         var befor_total_count = stock_max_number * min_number + stock_min_number
+         var after_total_count = last_stock_max_number * min_number + last_stock_min_number
+         var retail_price = 0
+         var price = 0
+         var max_count = 0
+         var min_count = 0
+         var total_price = 0
+        for(let i=0;i<this.inventoryList.length;i++){
+          if(id == this.inventoryList[i].id){
+            retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+            price = this.inventoryList[i].drug_warehouse_info.price
           }
-          if(retail_price > 0){
-          return retail_price
+        }
+
+         //如果透前数量大于透后数量 盘亏
+         if(befor_total_count  > after_total_count){
+           cha_count = befor_total_count - after_total_count
+         }
+         max_count = cha_count/min_number
+         min_count = cha_count%min_number
+         console.log("price",price/min_number)
+         console.log("max_count23323232",max_count)
+         console.log("min_count33333",min_count)
+         console.log("min_number2332233232",min_number)
+         
+         total_price = Math.floor(max_count) * price + min_count * (price/min_number)
+         
+         if(total_price > 0){
+            return total_price.toFixed(2)
+         }else{
+          return ""
+         }
+        return cha_count
+       },
+       getCountOne(stock_max_number,stock_min_number,last_stock_max_number,last_stock_min_number,min_number,id){
+         var cha_count = 0
+         var befor_total_count = 0
+         var after_total_count = 0
+         var befor_total_count = stock_max_number * min_number + stock_min_number
+         var after_total_count = last_stock_max_number * min_number + last_stock_min_number
+         var retail_price = 0
+         var price = 0
+         var max_count = 0
+         var min_count = 0
+         var total_price = 0
+          for(let i=0;i<this.inventoryList.length;i++){
+          if(id == this.inventoryList[i].id){
+            retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+            price = this.inventoryList[i].drug_warehouse_info.price
           }
-          
+        }
+         //如果透前数量大于透后数量 盘盈
+         if(befor_total_count  < after_total_count){
+           cha_count = after_total_count - befor_total_count
+         }
+         max_count = cha_count/min_number
+         min_count = cha_count%min_number
+         total_price =  Math.floor(max_count) *price + min_count * (price/min_number)
+         if(total_price > 0){
+            return total_price.toFixed(2)
+         }else{
+          return ""
          }
+        
+       }
     },
     created(){
 

src/xt_pages/stock/inventoryDetails.vue

@@ -26,7 +26,7 @@
                 @click="search">搜索</el-button>
             </div>
             <div>
-              <!-- <el-button type="primary" @click="toprint">打印</el-button> -->
+              <el-button type="primary" @click="toprint">打印</el-button>
               <el-button type="primary" @click="inventoryExportList">盘点模版打印</el-button>
             </div>
             <!-- <div>

src/xt_pages/stock/print_all.vue

@@ -31,7 +31,7 @@
                         <td width="60">总额</td>
                         
                     </tr>
-                    <tr v-for="(item,index) in tableData" :key="index">
+                    <tr v-for="(item,index) in tableList" :key="index">
                         <td>{{item.good_name}}</td>
                         <td>{{item.specification_name}}</td>
                         <td>{{item.packing_unit}}</td>
@@ -40,14 +40,15 @@
                         <td>{{getHouseName(item.storehouse_id)}}</td>
                         <td>{{item.stock_count}}</td>
                         <td>{{item.last_stock_count}}</td>
-                        <td>  
-                          <span v-if="item.stock_count > item.last_stock_count">盘亏</span>
-                          <span v-if="item.stock_count < item.last_stock_count">盘盈</span>
-                        </td>
-                        <td>{{item.buy_price}}</td>
                         <td>
-                          <span v-if="item.stock_count > item.last_stock_count">{{((item.stock_count - item.last_stock_count)  * item.buy_price).toFixed(2)}}</span> 
-                        </td>
+                          <span v-if="item.stock_count > item.last_stock_count">盘亏</span>
+                          <span v-if="item.stock_count < item.last_stock_count">盘盈</span></td>
+                        <td><span>{{item.buy_price}}</span></td>
+                         <td>
+                            <span v-if="item.stock_count > item.last_stock_count">{{((item.stock_count - item.last_stock_count)  * item.buy_price).toFixed(2)}}</span> 
+                            <span v-if="item.stock_count < item.last_stock_count">{{((item.last_stock_count - item.stock_count)  * item.buy_price).toFixed(2)}}</span> 
+                            <span v-if="item.stock_count == item.last_stock_count">0</span> 
+                         </td>
                     </tr>
                     </tbody>
                 </table>
@@ -75,7 +76,7 @@ export default {
           ],
           org_name: this.$store.getters.xt_user.org.org_name,
           ids:"",
-          tableData:[],
+          tableList:[],
           manufacturerList:[],
           houseList:[],
         }
@@ -110,9 +111,10 @@ export default {
           }
          getPrintList(params).then(response=>{
            if(response.data.state == 1){
-             var list =  response.data.data.list
-             console.log("list233233232323",list)
-             this.tableData = list
+             var list = response.data.data.list
+             console.log("list232332232323",response.data.data.list)
+             this.tableList = list
+             console.log("list233233232323",this.tableList)
              this.houseList = response.data.data.houseList
            }
          })

src/xt_pages/stock/stockBatchNumber.vue

@@ -92,6 +92,11 @@
              <span v-if="scope.row.packing_price > 0"> {{scope.row.packing_price}}</span>
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="备注" align="center">
+           <template slot-scope="scope">
+             <span>{{scope.row.remark}}</span>
+           </template>
+        </el-table-column>
        </el-table>
        
       <el-pagination

src/xt_pages/stock/stockOutOrder.vue

@@ -1284,6 +1284,7 @@ export default {
       }
     },
     select(selection) {
+     
       var ids = [];
       for (let i = 0; i < selection.length; i++) {
         ids.push(selection[i].id);
@@ -1291,7 +1292,9 @@ export default {
 
       this.exportList = [];
       this.order_id = ids.join(",");
-      this.warehouse_out_time = selection[0].warehouse_out_time;
+      if(selection.length >0){
+        this.warehouse_out_time = selection[0].warehouse_out_time;
+      }
       this.selectedTableData = selection;
       this.getlist();
     },
@@ -1874,7 +1877,7 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
       };
-
+      console.log("params2332323232de",params)
       getOutExportList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
@@ -1920,6 +1923,8 @@ export default {
         this.$message.error("请勾选出库单");
         return;
       }
+      console.log("时间",this.exportList)
+      
       import("@/vendor/Export2Excel").then((excel) => {
         for (let i = 0; i < this.exportList.length; i++) {
           this.exportList[i].total_price =
@@ -1938,6 +1943,7 @@ export default {
           if (this.exportList[i].good_type_id == 0) {
             this.exportList[i].good_type_id = "";
           }
+          this.exportList[i].ctime = this.getTime(this.exportList[i].ctime, "{y}-{m}-{d}")
         }
 
         const tHeader = [
@@ -1952,6 +1958,7 @@ export default {
           "生产日期",
           "有效期",
           "备注",
+          "出库时间"
         ];
         const filterVal = [
           "good_name",
@@ -1965,6 +1972,7 @@ export default {
           "product_date",
           "expiry_date",
           "remark",
+          "ctime",
         ];
 
         const data = this.formatJson(filterVal, this.exportList);