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

src/api/pharmacy.js

@@ -192,6 +192,15 @@ export function changeDrugCode(params){
   })
 }
 
+export function changeBloodCode(params){
+  
+  return request({
+    url:"/api/pharmacy/changebloodcode",
+    method:"get",
+    params:params,
+  })
+}
+
 export function getDrugTocalCount(params){
 
   return request({

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -562,7 +562,6 @@ export default {
     getTotal(){
       if(this.textarea!=null){
         var  textAreaList = this.textarea.split(",")
-        console.log("textArrleti",textAreaList)
         var arr = []
         if(textAreaList!=null && textAreaList.length>0){
           for(let i=0;i<textAreaList.length;i++){
@@ -671,6 +670,8 @@ export default {
       }
     },
     saveTextArea(){
+
+
       
        var params = {
         id:this.id,
@@ -698,21 +699,20 @@ export default {
         var textarea = ""
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
 
-        console.log("textarea==============",textarea)
-
-        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610|| this.$store.getters.xt_user.org.id == 10537){
+      
+        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537){
           
           var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
-          console.log("drugindentification===================",drugindentificaitoncode)
+          // console.log("drugindentification===================",drugindentificaitoncode)
 
           var scan_code = this.getDrugScanCode(this.drug_id)
           
-          console.log("scan_code============",scan_code)
+          // console.log("scan_code============",scan_code)
 
           var total_one = 0
           var total_two = 0
 
-          console.log("newArr-------------",this.newArrList)
+          // console.log("newArr-------------",this.newArrList)
 
           var arr= []
           arr = textarea.split(",")
@@ -786,10 +786,10 @@ export default {
           }
 
 
-          console.log("数量1--------------",total_one)
-          console.log("数量2---------------",total_two)
+          // console.log("数量1--------------",total_one)
+          // console.log("数量2---------------",total_two)
         
-          console.log("scan_code=====",scan_code)
+          // console.log("scan_code=====",scan_code)
           
           if(scan_code>0){
             if((total_one + total_two)>scan_code){
@@ -800,11 +800,44 @@ export default {
          
          var is_arr = this.hasDuplicates(arr)
 
-         console.log("is_arr-=--------------",is_arr)
+        //  console.log("is_arr-=--------------",is_arr)
 
         this.textarea = arr.join(",")
 
         }else{
+          // console.log("textarea22==============",textarea)
+
+          var newArr = []
+          var is_err_check = 0
+          var i_index = ""
+          var arr = textarea.split(",")
+          if(arr!=null && arr.length>0){
+            
+            for(let i=0;i<arr.length;i++){
+              console.log("arrp[i].")
+              i_index = i
+              if(arr[i]!=""){
+                if(arr[i].length!=20){
+                 this.$message.error("药品追溯码长度没有满足20位!")
+                  is_err_check = 1
+                }else{
+                  newArr.push(arr[i])
+                }
+                
+              }
+            }
+          }
+          // console.log("is_err_check==============",is_err_check)
+          // console.log("i_index=====",i_index)
+          if(is_err_check == 1){
+             newArr.splice(i_index,1)
+          }
+
+          
+          if(newArr!=null && newArr.length>0){
+           
+            this.textarea = newArr.join(",")
+          }
           this.textarea = textarea
         }
        

src/xt_pages/Pharmacy/drugCode.vue

@@ -80,6 +80,17 @@
           </el-option>
         </el-select>
       </div>&nbsp;&nbsp;
+
+      <div>数据来源:
+        <el-select size="small" v-model="is_type" placeholder="请选择" style="width:100px;" @change="changeType">
+          <el-option
+            v-for="item,index in advice_items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>&nbsp;&nbsp;
     </div>
     <el-table v-loading="isloading" :data="tableData" border :row-style="{ color: '#303133' }" ref="table2"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -125,7 +136,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" label="发药状态">
+      <el-table-column align="center" prop="name" label="发药状态" v-if="is_type == 1">
         <template slot-scope="scope">
           <div v-if="scope.row.is_medicine == 1">已发药</div>
           <div v-if="scope.row.is_medicine == 2 || scope.row.is_medicine == 0">未发药</div>
@@ -133,8 +144,9 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="name" label="结算状态">
+      <el-table-column align="center" prop="name" label="结算状态" v-if="is_type == 1">
         <template slot-scope="scope">
+          
           <div v-if="scope.row.pre.order_status == 2">已结算</div>
           <div v-if="scope.row.pre.order_status != 2">未结算</div>
         </template>
@@ -224,6 +236,7 @@ export default {
       value: 0,
       keywords:"",
       is_sale: "0",
+      is_type:"1",
       items: [
         {id: "0", name: '全部'},
         {id: "1", name: '已上传'},
@@ -240,6 +253,10 @@ export default {
         {id: "2", name: '已结算'},
         {id: "1", name: '未结算'},
       ],
+      advice_items:[
+        {id:"1",name:"HIS系统"},
+        {id:"2",name:"血透系统"},
+      ],
       patientList: [],
       drugList: [],
       dialogVisibleOne: false,
@@ -388,6 +405,10 @@ export default {
         this.textarea = textarea
       }
     },
+    changeType(val){
+      this.is_type =val
+      this.getlist()
+    },
     getDrugCode(id, DataSources, DrugCode, index) {
       this.id = id
       this.textarea = DrugCode
@@ -401,17 +422,36 @@ export default {
         drug_code: this.textarea,
       }
       console.log("paramss", params)
-      changeDrugCode(params).then(response => {
-        if (response.data.state == 1) {
-          this.$message.success("保存成功!")
-          for (let i = 0; i < this.tableData.length; i++) {
-            if (this.currentIndex == i) {
-              this.tableData[i].drug_code = this.textarea
+      if(this.is_type == 1){
+        changeDrugCode(params).then(response => {
+          if (response.data.state == 1) {
+            this.$message.success("保存成功!")
+            for (let i = 0; i < this.tableData.length; i++) {
+              if (this.currentIndex == i) {
+                this.tableData[i].drug_code = this.textarea
+              }
             }
+            this.dialogVisibleOne = false
           }
-          this.dialogVisibleOne = false
-        }
-      })
+       })
+      }
+      if(this.is_type == 2){
+        var params = {
+          id: this.id,
+          data_source: 2,
+          drug_code: this.textarea,
+         }
+        changeDrugCode(params).then(response=>{
+          this.$message.success("保存成功!")
+            for (let i = 0; i < this.tableData.length; i++) {
+              if (this.currentIndex == i) {
+                this.tableData[i].drug_code = this.textarea
+              }
+            }
+            this.dialogVisibleOne = false
+         })
+      }
+     
     },
     getPatientName(id) {
       var name = ""
@@ -626,7 +666,7 @@ export default {
         is_settle:this.is_settle,
         is_code:this.is_code,
         keywords:this.keywords,
-
+        is_type:parseInt(this.is_type),
       }
       getHisDrugCodeQueryList(params).then(response => {
         if (response.data.state == 0) {

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

@@ -2240,14 +2240,14 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('累计血容量') && (template_id == 41 || org_id == 9671 || org_id == 9538 || org_id == 10340)">
+          <el-col :span="8" v-if="isShow('累计血容量') && (template_id == 41 || org_id == 9671 || org_id == 9538 || org_id == 10340 || org_id==10517)">
             <el-form-item label="累计血容量(L)：" :prop="isName('累计血容量')"
               :rules="isCheckmust('累计血容量')">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('累计血容量') && (template_id  != 41 && template_id !=9671 && org_id!=9538 && org_id!=10340)">
+          <el-col :span="8" v-if="isShow('累计血容量') && (template_id  != 41 && template_id !=9671 && org_id!=9538 && org_id!=10340 && org_id!=10517)">
             <el-form-item label="累计血容量(ml)：" :prop="isName('累计血容量')"
               :rules="isCheckmust('累计血容量')">
               <el-input v-model="form.accumulated_blood_volume"></el-input>

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

@@ -590,7 +590,7 @@ export default {
 
 
        if(this.org_id ==10090){
-          var str = "患者今日常规进行血液透析治疗，目前诊断：1.尿毒症 2.肾性贫血 3.肾性骨病 4肉毒碱缺乏症 5.心功能不全，需继续使用促红素、左卡尼汀、帕立骨化醇治疗。 "+"血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
+          var str = "患者今日常规进行血液透析治疗，患者透前未诉头晕乏力抽筋不适，未诉咳嗽喘憋及夜间呼吸困难，未诉牙龈出血，未见出血点及瘀斑。心肺无殊，双下肢无浮肿。目前诊断：1.尿毒症 2.肾性贫血 3.肾性骨病 4肉毒碱缺乏症 5.心功能不全，需继续使用促红素、左卡尼汀、帕立骨化醇治疗。 "+"血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
         ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus +
         ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"L" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +","+"透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
         ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"L"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利，安全下机" + " "

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -2,8 +2,7 @@
   <div>
     <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
-      <div
-        id="dialysis-print-box-1-1"
+      <div id="dialysis-print-box-1-1"
         class="dialysis-print-order print-template-two print_page_main_content"
       >
 
@@ -293,7 +292,7 @@
             <td width="10%">核对者签名</td>
           </tr>
           <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
-            <td style="height:25px;line-height:25px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+            <td style="height:25px;line-height:25px">{{ getTime(advice.start_time, "{h}:{i}") }}</td>
             <td class="parent">
               <span v-if="advice.parent_id > 0">---></span>
               <span>{{ advice.advice_name }}</span>
@@ -317,7 +316,7 @@
                 <img style="height:25px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
               </span>
             </td>
-            <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+            <td>{{ getTime(advice.execution_time, "{h}:{i}") }}</td>
             <td>
               <span v-if="setAdminUserES(advice.execution_staff) == ''">
                 {{
@@ -1465,7 +1464,7 @@ export default {
             this.isShowZero = true
           }
           if (this.monitors.length < 7) {
-            var nl = 8 - this.monitors.length
+            var nl = 7 - this.monitors.length
             for (let index = 0; index < nl; index++) {
               this.monitors.push([])
             }

src/xt_pages/outpatientTool/labelPrint.vue

@@ -134,7 +134,7 @@
                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
                           </div>
-                          <img style="height: 85px;" v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
+                          <img style="" v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
                       </div>
                       <div style="margin-bottom:0px;">{{current_number}}</div>
                       <div style="display:flex;">
@@ -491,10 +491,10 @@
                   format: 'CODE39',
                   lineColor: '#000',
                   background: '#EBEEF5',
-                  // width: 3,
-                  // height: 200,
-                  width: 1,
-                  height: 90,
+                  width: 3,
+                  height: 200,
+                  // width: 1,
+                  // height: 90,
                   displayValue: false,
                   fontOptions:"bold italic",//使文字加粗体或变斜体
                   font:"fantasy",//设置文本的字体

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -292,17 +292,18 @@ export default {
                if(this.org_id ==10697){
                   list[i].stock_in_price = list[i].buy_price
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
-               }else if(this.org_id ==0){
+               }else if(this.org_id ==9671){
                 list[i].stock_in_price = list[i].buy_price
                 list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
-               }else if(this.org_id == 10644 || this.org_id == 10752){
+               }else if(this.org_id == 10644 || this.org_id == 10752 || this.org_id == 0){
                  list[i].stock_in_price = "/"
-                //  console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
-                //  console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))
-                //  console.log("val3",this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) )
-                //  console.log("val4",this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
+                 console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
+                 console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))
+                 console.log("val3",this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) )
+                 console.log("val4",this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
 
                 list[i].stockMoney = parseFloat(this.getAllStockInPrice(list[i].StWarehousingInfoTwo))  +parseFloat(this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))  - parseFloat(this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty))  - parseFloat(this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)) 
+                console.log("剩余33333333  ",list[i].stockMoney)
                 if(list[i].stockMoney>0){
                   list[i].stockMoney = list[i].stockMoney.toFixed(2)
                 }
@@ -1300,7 +1301,13 @@ export default {
        var total_price =0
        if(val!=null && val.length>0){
          for(let i=0;i<val.length;i++){
-            total_price += val[i].warehousing_count * val[i].price
+            if(this.org_id == 10644){
+              total_price += val[i].warehousing_count * val[i].price
+            }
+            if(this.org_id != 10644){
+              total_price += val[i].warehousing_count * val[i].packing_price
+            }
+           
          }
 
        }

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -822,7 +822,12 @@ export default {
        var total_price =0
        if(val!=null && val.length>0){
          for(let i=0;i<val.length;i++){
-            total_price += val[i].warehousing_count * val[i].price
+          if(this.org_id == 10644){
+              total_price += val[i].warehousing_count * val[i].price
+            }
+            if(this.org_id != 10644){
+              total_price += val[i].warehousing_count * val[i].packing_price
+            }
          }
 
        }

src/xt_pages/user/coursePrint.vue

@@ -45,19 +45,15 @@
 
             </div>
           </div>
-          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;" v-for="(item,index) in this.record" :key="index">
+          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:30px;" v-for="(item,index) in this.record" :key="index">
             <div class="inline_block" style="display: inline-block;">
               <div>{{getTime(item.record_time,'{y}-{m}-{d} {h}:{i}')}}</div>
             </div>
             <div class="inline_block" style="margin-left: 30px;display: inline-block;">
               <div>{{item.title}}</div>
             </div>
-
-            <!-- <div class="inline_block" style="width:100%; word-wrap: break-word; word-break: break-all;"> -->
-              <div v-html="item.content" ></div>
-            <!-- </div> class="printP" -->
-
-            <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;float:right">
+            <div v-html="item.content" ></div>
+            <div class="row" style="padding: 2px 0;line-height:24px;float:right">
              医生签名：
              <span v-if="setAdminUserES(item.recorder?item.recorder:item.recorder) == ''">
                   {{getName(item.recorder)}}
@@ -68,7 +64,6 @@
             </div>
           </div>
 
-
         </div>
         <div class="print_page_main_content" v-if="org_id ==10206" >
           <div v-for="(item,index) in this.record" :key="index" style="page-break-after: always;">