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

@@ -20,11 +20,12 @@
                                       maxlength="30"></el-input>
                         </el-form-item>
 
-                        <!-- <el-form-item label="药品规格 : ">
-                            <el-input v-model="form.specification_name" style="width:160px;" placeholder=""
+                      <div v-if="org_id == 9671 || org_id == 7957 || org_id == 4">
+                        <el-form-item label="药品规格 : ">
+                            <el-input v-model="form.drug_spec" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
-                        </el-form-item> -->
-
+                        </el-form-item>
+                      </div>
                         <el-form-item label="药品类别 : " prop="drug_category">
                             <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
                                 <el-option
@@ -43,7 +44,7 @@
                               <el-input v-model="form.dose" type="number" style="width:100px;margin-right:5px;" placeholder="剂量" ></el-input>
                             </el-form-item>
                             <el-form-item prop="dose_unit" class="noMargin">
-                              <el-select v-model="form.dose_unit" style="width:160px;" placeholder="剂量单位" @change="changeDoseUnit">
+                              <el-select v-model="form.dose_unit" style="width:160px;" placeholder="剂量单位">
                                 <el-option
                                   v-for="(item,index) in getDataConfig('hemodialysis','units')"
                                   :key="index"
@@ -57,7 +58,7 @@
                               <el-input v-model="form.min_number" style="width:100px;margin-right:5px;"  type="number" placeholder="拆零"> </el-input>
                             </el-form-item>
                             <el-form-item prop="min_unit" class="noMargin">
-                              <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
+                              <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位">
                                 <el-option
                                   v-for="(item,index) in getDataConfig('hemodialysis','units')"
                                   :key="index"
@@ -68,7 +69,7 @@
                             </el-form-item>
                           <span style="margin-bottom:20px;font-size:20px;padding:0 10px;">/</span>
                           <el-form-item prop="max_unit" class="noMargin">
-                            <el-select v-model="form.max_unit" style="width:160px;" placeholder="包装单位" @change="changeMaxUnit">
+                            <el-select v-model="form.max_unit" style="width:160px;" placeholder="包装单位">
                               <el-option
                                 v-for="(item,index) in getDataConfig('hemodialysis','units')"
                                 :key="index"
@@ -575,6 +576,7 @@
           dose:"",//剂量单位
           prescribing_number_unit:"",
           total:"",
+          specification_name:"",
         },
 
         rules: {
@@ -654,7 +656,6 @@
         this.$refs[formName].validate((valid) => {
           console.log(valid)
           if (valid) {
-            // console.log(1111,this.getValue())
             this.$emit('dialog-comfirm', this.getValue())
           }
         })
@@ -697,7 +698,7 @@
           }
           if(obj.max_unit == arr[i].name){
             this.packingUnit.push(arr[i])
-          } 
+          }
 
           let idArr = []
           this.unitList.map(item => {
@@ -886,6 +887,7 @@
         form['dose_unit'] = this.form.dose_unit
         form['min_price'] = this.form.min_price
         form['prescribing_number_unit'] = this.form.prescribing_number_unit
+        form['specification_name'] = this.form.specification_name
         return form
       },
       getlist() {
@@ -1018,7 +1020,7 @@
       //       if(this.form.prescribing_number_unit == arr[i].id){
       //         this.packingUnit.push(arr[i])
       //       }
-            
+
 
 
 
@@ -1098,6 +1100,8 @@
       }
     },
     created() {
+      this.org_id = this.$store.getters.xt_user.org.id
+      console.log("机构ID",this.org_id)
       this.getInitializtion()
        //获取所有经销商
       this.GetAllConfig()

src/xt_pages/data/components/drugs.vue

@@ -682,7 +682,7 @@
                  this.formValue.drug_classify = ""
               }
 
-
+              
 
               this.$refs.addDrugs.show(id, this.formValue)
 

src/xt_pages/dialysis/PatientBox.vue

@@ -231,7 +231,7 @@ export default {
       temp_schedual: null,
       date:'',
       modedata:0,
-      stockType:"",
+      stockType:[],
     };
   },
   props: {

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -109,13 +109,16 @@
 
         <li v-if="isShow('封管液配置')">
           <label>封管液配置: </label>
-          <!-- <span class="content">{{ getSealingFluidDisposeName(this.record.sealing_fluid_dispose) }}</span> -->
-           <span class="content">{{this.record.sealing_fluid_dispose}}</span>
+           <span class="content">{{this.record.sealing_fluid_dispose?this.record.sealing_fluid_dispose:""}}</span>
         </li>
 
-        <li v-if="isShow('封管液特殊') && this.record.sealing_fluid_dispose.indexOf('特殊')>-1">
+        <li v-if="isShow('封管液特殊') && this.record.id > 0">
           <label>封管液配置(特殊): </label>
-          <span class="content">{{ sealing_fluid_special }}</span>
+          <span class="content">
+            <span>
+              {{ sealing_fluid_special }}
+            </span>  
+          </span>
         </li>
 
         <!-- <li style="height: 0.6rem;">

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -283,10 +283,10 @@
 
         <li v-if="isShow('导管缝线')">
           <label>导管缝线: </label>
-          <span class="content" v-if="this.record && this.record.catheter_suture.length > 0 && this.record.catheter_suture_other.length > 0 ">{{this.record.catheter_suture }},{{this.record.catheter_suture_other }}</span>
-          <span class="content" v-if="this.record &&this.record.catheter_suture.length > 0 && this.record.catheter_suture_other.length == 0 ">{{this.record.catheter_suture }}</span>
-          <span class="content" v-if="this.record &&this.record.catheter_suture.length == 0 && this.record.catheter_suture_other.length > 0 ">{{this.record.catheter_suture_other }}</span>
-          <span class="content" v-if="this.record && this.record.catheter_suture.length == 0 && this.record.catheter_suture_other.length == 0 "></span>
+          <span class="content" v-if="this.record.id > 0 && this.record.catheter_suture.length > 0 && this.record.catheter_suture_other.length > 0 ">{{this.record.catheter_suture }},{{this.record.catheter_suture_other }}</span>
+          <span class="content" v-if="this.record.id >0 && this.record.catheter_suture.length > 0 && this.record.catheter_suture_other.length == 0 ">{{this.record.catheter_suture }}</span>
+          <span class="content" v-if="this.record.id >0 && this.record.catheter_suture.length == 0 && this.record.catheter_suture_other.length > 0 ">{{this.record.catheter_suture_other }}</span>
+          <span class="content" v-if="this.record.id >0 && this.record.catheter_suture.length == 0 && this.record.catheter_suture_other.length == 0 "></span>
           <span class="unit"></span>
         </li>
 

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1674,7 +1674,7 @@ export default {
      
     },
     changeDrugDesc(name) {
-      
+        console.log("hhhhhhhhhh",this.drugSpec)
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
           if (this.drugSpec[i].drug_spec == name) {
@@ -1736,8 +1736,7 @@ export default {
         console.log("22222",val)
         this.drug_id = val.id
         this.nameForm.way = 1 
-        console.log("hhhh23",this.drug_id) 
-        console.log("hhhhhh",this.nameForm.way)
+       
       },
       handleSelect1(){
 

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

@@ -746,7 +746,7 @@
         }
       },
       lastAssessment:{
-        type:Array,
+        type:Object,
          default: () => {
           return []
         }

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

@@ -1359,7 +1359,9 @@
           { id: 1, name: '需' },
           { id: 2, name: '无' }
         ],
-        oxygenShow: false
+        oxygenShow: false,
+        hemodialysisPipelinesOptions: [],
+        epoOptions: []
       }
     },
     methods: {

src/xt_pages/dialysis/details/index.vue

@@ -1153,7 +1153,11 @@ export default {
           console.log("stockTYPW",stockType)
 
           var prepare = resp.data.prepare
-          this.preparestock = prepare
+          if(prepare!=null){
+            this.preparestock = prepare
+          }else{
+            this.preparestock = []
+          }
           console.log("prepare222222",prepare)
 
           for (let i = 0; i <  this.doctor_advices.length; i++){
@@ -1249,7 +1253,6 @@ export default {
             zone_options.push({ id: zone.id, text: zone.name })
           }
           this.zone_options = zone_options
-          // this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
           this.arr = this.processedDialysisSchedules(schedules, this.zone_options)
           this.requestDialysisSchedules()
         } else {
@@ -1335,6 +1338,7 @@ export default {
         var resp = rs.data
         if (resp.state == 1) {
           var schedules = resp.data.schedules
+          console.log("当前排班信息4444444444444444",schedules)
           this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
           const patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
           if (this.activeName == 'first') {
@@ -1369,7 +1373,6 @@ export default {
       })
     },
     changePatient(schedual) {
-      console.log("schedual",schedual)
       this.patient_id = schedual.patient_id
       this.date = schedual.schedule_date
       // this.getScheduleDetail();
@@ -1716,7 +1719,6 @@ export default {
       return strDate;
     },
     refresh(){
-      console.log('1111111')
       this.requestDialysisSchedules()
     },
     websocketSend(data) {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -511,7 +511,7 @@
             icon="el-icon-printer"
             @click="printThisOnePage"
             type="primary"
-            >打印纪录单</el-button
+            >打印记录单</el-button
           >
           <el-button
             :loading="loading"

src/xt_pages/dialysis/schedualPatient.vue

@@ -573,7 +573,6 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       //   // })
       // },
       handleScheduleDateChange: function(index) {
-        console.log("askdjlkas",index)
         this.zone_selected = 0
         this.schedule_type_selected = 0
         this.patientStateVal = 0
@@ -616,7 +615,6 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             // this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
             this.requestDialysisSchedules()
 
-            console.log(1111111111111,this.zone_schedules)
           } else {
             this.$message.error(resp.msg)
           }
@@ -628,6 +626,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           var resp = rs.data
           if (resp.state == 1) {
             var schedules = resp.data.schedules
+            console.log("透析详情页面",schedules)
             this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
             this.allPatient = this.filtedSchedules
             this.getData()

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue

@@ -262,7 +262,7 @@
                     </td>
                     <td width='30'></td>
                     <td width='50'>导管：</td>
-                    <td width='60'>官腔外露</td>
+                    <td width='60'>管腔外露</td>
                     <td width="60">
                       <div class="under-line">
                         &nbsp;
@@ -573,15 +573,12 @@
                     <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
                 </div>
             </td>
-            <td width="100">穿刺/开管护士:</td>
+            <td width="100">穿刺护士:</td>
             <td width="100">
 
                 <div>
                     <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
                     <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
-                    /
-                    <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.new_fistula_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.new_fistula_nurse)}}</span>
-                    <img class="es-img" style="height:38px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.new_fistula_nurse)" alt="" srcset="" v-else>
                 </div>
             </td>
             <td width="70">核对护士:</td>
@@ -626,6 +623,7 @@
             <td width="60">电导度<br/>ms/cm</td>
             <td width="40">液温<br/>℃</td>
             <td width="40">ktv</td>
+            <td width="40">血糖<br/>mmol/L</td>
             <td width="">特殊处理</td>
             <td width='60'>执行护士</td>
           </tr>
@@ -675,6 +673,9 @@
             <td>
               &nbsp;{{ monitor.ktv ? monitor.ktv : "" }}
             </td>
+            <td>
+              &nbsp;{{ monitor.blood_sugar ? monitor.blood_sugar : "" }}
+            </td>
             <td>
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </td>

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -5,8 +5,8 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       药品名称:<span>{{this.$route.query.drug_name}}</span>&nbsp;
-       库存: {{this.$route.query.overPlus}}
+       药品名称:<span>{{getName(this.$route.query.drug_id)}}</span>&nbsp;
+       库存: {{this.$route.query.over_plus}}
        规格:<span>{{this.$route.query.unit}}</span>&nbsp;
        厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
 
@@ -240,10 +240,12 @@
         autoCountList:[],
         drugOutList:[],
         total:0,
+        drug:{},
       }
     },
     methods:{
        getlist(){
+         console.log("2332233232",this.$route.query.drug_id)
            var params = {
              drug_id:this.$route.query.drug_id,
              start_time:this.start_time,
@@ -252,6 +254,7 @@
              limit:this.limit,
              stock_type:this.stock_type,  
            }
+          console.log("params23322323232332",params)
          getDrugStockFlow(params).then(response=>{
            if(response.data.state == 1){
             var list = response.data.data.list
@@ -264,7 +267,7 @@
             this.total = total
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
-           
+         
            }
          })  
        },
@@ -487,6 +490,9 @@
             this.total =total
             this.manufacturerList = response.data.data.manufacturerList
             this.dealerList = response.data.data.dealerList
+            var drug = response.data.data.drug
+            console.log("drug233223232323223",drug)
+            this.drug = drug
           }
        })
      },
@@ -504,6 +510,13 @@
          str_min = total%min_number + min_unit
        }
         return str+str_min
+     },
+     getName(drug_id){
+        var name = ""
+        if(drug_id == this.drug.id){
+           name = this.drug.drug_name
+        }
+        return name
      }
     }
   }

src/xt_pages/stock/drugs/query.vue

@@ -532,6 +532,7 @@ import { min } from 'moment'
         return name
       },
       handleDetail(val){
+        console.log("val232332323223323",val)
         var manufacturer_name = ""
         for(let i=0;i<this.manufacturerList.length;i++){
          if(val.manufacturer == this.manufacturerList[i].id){
@@ -539,10 +540,11 @@ import { min } from 'moment'
          }
         }
         var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
-        var overPlus = this.getOverFlushInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
+        var over_plus = this.getOverFlushInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
+        this.$router.push({path:'/drugstock/in/drugstockflow?drug_id='+val.id+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&over_plus="+over_plus})
         window.sessionStorage.setItem('start_time',this.start_time)
         window.sessionStorage.setItem('end_time',this.end_time)
-        this.$router.push({path:'/drugstock/in/drugstockflow?drug_id='+val.id+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&overPlus="+overPlus})
+        
       },
       handleBatch(val){
         var manufacturer_name = ""
@@ -552,10 +554,11 @@ import { min } from 'moment'
          }
         }
         var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
-        var overPlus = this.getOverFlushInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
+        var over_plus = this.getOverFlushInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
+       
         window.sessionStorage.setItem('start_time',this.start_time)
         window.sessionStorage.setItem('end_time',this.end_time)
-        this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+val.id+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&overPlus="+overPlus})
+        this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+val.id+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&over_plus="+over_plus})
       },
       getDrugCountList(){
          var params = {

src/xt_pages/stock/stockQuery.vue

@@ -108,7 +108,7 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center" v-if="showOne">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088 || org_id == 10191">
             <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
             </span>
@@ -125,7 +125,7 @@
 
        <el-table-column label="剩余库存量" align="center" v-if="showThree">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
@@ -359,13 +359,13 @@ export default {
            this.tableList[i].inCount =  this.getWareInfo(this.tableList[i].xt_warehouse_info)
 
           if(this.end_time == ""){
-            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 ){
+            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 || this.org_id == 10191){
               this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
             }else{
               this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
             }
             
-            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 ){
+            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 || this.org_id == 10191){
                 this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
             }else{
               this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)

src/xt_pages/user/dialysisRecord.vue

@@ -422,6 +422,7 @@ export default {
   },
   methods: {
     getTime(record){
+      console.log("recode2332232332232332",record)
       if(record != null&&record.id > 0) {
         let actual_treatment_hour = 0
         let actual_treatment_minute = 0