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

src/api/drug/drug_stock.js

     method:"Get",
     params:params,
   })
+}
+
+export function ModityDrugCodeWarehouseInfo(data){
+ 
+  return request({
+    url:"/api/drug/modifydrugcodewarehouseinfo",
+    method:"post",
+    data:data,
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                           <span v-if="org_id!=0&&org_id!=10683">置换量</span>
                           <span v-if="org_id ==0||org_id==10683">置换液速度</span>
                             <br />
-                            <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724">
+                            <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724 && org_id!=10644">
                               <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
                               <span v-if="org_id ==0||org_id==10683">(ml/h)</span>
                             </span>
-                            <span v-if="org_id==10598 || org_id == 10567 || org_id ==10724">L</span>
+                            <span v-if="org_id==10598 || org_id == 10567 || org_id ==10724 || org_id == 10644">L</span>
                           </td>
                           <td v-if="org_id == 3877  || org_id == 10449" width="50">滤前压(mmHg)</td>
                           <td

src/xt_pages/dialysis/bloodPresssWatch.vue

           :disabled="selecting_schs.length == 0"
           @click="batchPrintAction"
           type="primary"
-          >批量打印81</el-button>
+          >批量打印</el-button>
       </template>
     </div>
     <div class="app-container">

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

                 org_id!=10558 &&
                 org_id!=10517 && 
                 org_id!=10414 && 
-                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567) ||
+                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
             :span="8"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644) &&
               org_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
                 org_id != 9919 &&
                 org_id != 10191 &&
                 org_id != 10551 &&
-                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567) ||
+                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567 && org_id!=10644) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
                 org_id ==10432 ||
                 org_id ==10445 ||
                 org_id == 10395) &&
-                org_id!=10694 && org_id!=10697
+                org_id!=10694 && org_id!=10697 
             "
           >
             <el-form-item label="置换量(ml)：" :prop="isName('置换量')"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('置换量1')" width="92px"  > 置换量(L)  </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if=" isShow('SpO₂') && org_id == 9829" width="92px" > SpO₂(%) </th>
           <td v-if="isShow('透析液温度1')"> {{ monitor.dialysate_temperature_one ? monitor.dialysate_temperature_one : "/" }} </td>
           <td v-if="isShow('置换率')"> {{ monitor.replacement_rate ? monitor.replacement_rate : "0" }} </td>
           <td v-if="isShow('置换率1')"> {{ monitor.replacement_rate ? monitor.replacement_rate : "/" }} </td>
-          <td v-if="isShow('置换量')"> {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }} </td>
+          <td v-if="isShow('置换量')"> {{ monitor.displacement_quantity ? monitor.displacement_quantity : "0" }} </td>
           <td v-if="isShow('置换量1')"> {{ monitor.displacement_quantity_one ? monitor.displacement_quantity_one : "/" }} </td>
           <td v-if="isShow('SpO₂')"> {{ monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "" }} </td>
           <td v-if="isShow('SpO₂') && org_id == 9829" width="92px" >{{ monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "" }} </td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                           <span v-if="org_id == 10683">置换液速度</span>
                           <span v-if="org_id!=0&&org_id!=10683">置换量</span>
                           <br />
-                          <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724">
+                          <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724 && org_id!=10644">
                             <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
                             <span v-if="org_id==10683">(ml/h)</span>
                           </span>
-                          <span v-if="org_id==10598 || org_id == 10567 || org_id == 10724">(L)</span>
+                          <span v-if="org_id==10598 || org_id == 10567 || org_id == 10724 || org_id == 10644">(L)</span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id == 0 || org_id == 10724">KT/V</td>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

           抗凝药物 
           <div class="inline_block under_line" style="width:92%;text-align: left;">
             <label-box :isChecked="prescription.anticoagulant == '普通肝素' ? true : false" showValue="普通肝素"></label-box>&nbsp;
+            <label-box :isChecked="prescription.anticoagulant == '甲磺酸萘莫司他' ? true : false" showValue="甲磺酸萘莫司他"></label-box>&nbsp;
             <label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : prescription.anticoagulant == '低分子肝素钠' ? true : false" showValue="低分子肝素"></label-box>
             （<label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : false" showValue="钙"></label-box>
               <label-box :isChecked="prescription.anticoagulant == '低分子肝素钠' ? true : false" showValue="钠"></label-box>）
                 <td width="40">TMP</td>
                 <td width="40">电导率</td>
                 <td width="40">温度</td>
-                <td width="40">透析液流量</td>
+                <!-- <td width="40">透析液流量</td> -->
                 <td width="40">UF/hr</td>
                 <td width="200">病情变化处理方式及结果</td>
               </tr>
                 <td>&nbsp;{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:''}}</td>
                 <td>&nbsp;{{monitor.conductivity?monitor.conductivity:''}}</td>
                 <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
-                <td>&nbsp; <span v-if="monitor.operate_time"> {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }} </span></td>
+                <!-- <td>&nbsp; <span v-if="monitor.operate_time"> {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }} </span></td> -->
                 <td>&nbsp;{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
                 <td>
                   <span v-if="monitor.symptom"> {{ monitor.symptom }} </span>

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

       ) {
         const obj14 ='预透时间'
         checkDate.push(obj14)
-      } if (this.prescription.dialyzer_perfusion_apparatus == '' && 
+      } if (this.prescription.dialyzer_perfusion_apparatus == '' &&
             this.prescription.dialysis_dialyszers ==''
       ) {
         const obj15 ='透析(滤)器'
       ) {
         const obj27 ='首剂'
         checkDate.push(obj27)
-      } if (this.prescription.anticoagulant_zongliang == 0 && this.prescription.anticoagulant !=1 
+      } if (this.prescription.anticoagulant_zongliang == 0 && this.prescription.anticoagulant !=1
             && this.prescription.anticoagulant !='' && this.prescription.anticoagulant != 5
       ) {
         const obj28 ='总量'
         checkDate.push(obj28)
-      } if (this.dialysisOrder.DeviceNumber.number == 0 && 
+      } if (this.dialysisOrder.DeviceNumber.number == 0 &&
             this.patientInfo.DialysisSchedule.device_number.number ==''
       ) {
         const obj29 ='透析机号'
         checkDate.push(obj29)
-      } if (this.patientInfo.DialysisSchedule.bed_id == 0 && 
+      } if (this.patientInfo.DialysisSchedule.bed_id == 0 &&
             this.dialysisOrder && this.dialysisOrder.bed_id ==0
       ) {
         const obj30 ='型号'
           ){
             const obj58 = '监测第'+((i*1)+1)+'行置换率'
             monearr.push(obj58)
-          } 
+          }
           // if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0){
           //   const obj54 = '监测第'+((i*1)+1)+'行置换量'
           //   monearr.push(obj54)
-          // }  
+          // }
           if(this.monitors[i].sodium_concentration ==0 ){
             // this.monitors[i].temperature == 0
-            const obj59 = '监测第'+((i*1)+1)+'行钠浓度/温度'
+            const obj59 = '监测第'+((i*1)+1)+'行钠浓度'
             monearr.push(obj59)
           } if(this.monitors[i].pulse_frequency ==0){
             const obj60 = '监测第'+((i*1)+1)+'行脉搏'

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

       this.$refs.prescriptions.open_three()
     },
     open(index) {
-
+      console.log("index",index)
       this.index = index
       if (index == 1) {
         this.$refs.prescriptions.open(1, this.saveLoading)

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

             {{scope.row.total_price}}
           </template>
         </el-table-column>
+
+        <el-table-column label="药品追溯码" width="150" align="center">
+            <template slot-scope="scope">
+              <div  @click="changeDrugCode(scope.row,scope.$index)">
+                <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码"></el-input>
+              </div>
+            </template>
+          </el-table-column>
       </el-table>
 
       <el-pagination
       >
       </el-pagination>
     <!-- </el-row> -->
+
+    <el-dialog
+      title="药品追溯码"
+      :visible.sync="dialogVisible"
+      width="40%">
+      <span>
+        <el-input
+         @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers } from "@/api/doctor";
 import { GetAllConfig } from "@/api/stock";
-import { getDrugIndetail,getDrugWarehouseInfoPrint} from "@/api/drug/drug_stock"
+import { getDrugIndetail,getDrugWarehouseInfoPrint,ModityDrugCodeWarehouseInfo} from "@/api/drug/drug_stock"
 export default {
   name: "stockInDetail",
 
     //获取入库单数据
     this.getlist()
     this.getDrugWarehouseInfoPrint() 
-
+    
   },
   data() {
     return {
       drugTypeList:[],
       storehouse_id:0,
       houseList:[],
+      dialogVisible:false,
+      currentRow:{},
+      currentIndex:0,
+      textarea:"",
+      id:0,
     };
   },
   methods: {
+    changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+
+      }
+   },
+    changeDrugCode(row,index){
+      this.textarea=""
+      this.textarea = row.drug_code
+      this.currentRow = row
+      this.currentIndex =index
+      this.id = row.id
+      this.dialogVisible = true
+    },
+    saveTextArea(){
+        var params = {
+           id:this.id,
+           drug_code:this.textarea,
+        }
+        console.log("params=-==---",params)
+       ModityDrugCodeWarehouseInfo(params).then(response=>{
+          if(response.data.state == 1){
+            var info =  response.data.data.info
+            this.$message.success("保存成功!")
+            this.dialogVisible = false
+            this.getlist()
+          }
+       })
+   
+     
+    },
     changeType: function(val) {
      
       this.order_type = val;

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

 
           <el-table-column label="药品追溯码" width="150" align="center">
             <template slot-scope="scope">
-              <!-- <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码" :disabled="disabled"></el-input> -->
               <div  @click="changeDrugCode(scope.row,scope.$index)">
-                <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码" :disabled="disabled"></el-input>
+                <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码"></el-input>
               </div>
             </template>
           </el-table-column>
             </template>
           </el-table-column>
 
-         
+
 
           <el-table-column
             label="操作"
 
       for(let i=0;i<this.recordInfo.recordData.length;i++){
          if(this.currentIndex == i){
-           this.recordInfo.recordData[i].drug_code = this.textarea 
+           this.recordInfo.recordData[i].drug_code = this.textarea
          }
       }
       this.dialogVisible = false
             stockIn: this.recordInfo.recordData
           };
           console.log("params---------",params)
-         
+
           EditDrugWarehouse(
             params,
             this.warehousing_time,
            if(response.data.data.info[i].dealer == 0){
                response.data.data.info[i].dealer = ""
             }
-           
+
             response.data.data.info[i].unitList = []
             var obj = {id:1,name:""}
             var objOne = {id:2,name:""}
             objOne.name = response.data.data.info[i].drug.min_unit
             response.data.data.info[i].unitList.push(obj)
             response.data.data.info[i].unitList.push(objOne)
-            
+
 
             this.recordInfo.recordData.push(response.data.data.info[i]);
 
                }
             }
 
-          
+
           }
           this.warehouse = response.data.data.warehousing;
           this.storehouse_id = response.data.data.warehousing.storehouse_id
         }
     },
     getTotalPirce(){
-      
+
       var total_price = 0
       if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
-        
+
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            total_price += this.recordInfo.recordData[i].last_price * parseInt(this.recordInfo.recordData[i].warehousing_count)
         }

src/xt_pages/user/components/PatientDetail.vue

                     {{ patientPrint.id_card_no }}
                   </td>
                 </tr>
-                 <tr>
+                <tr>
                   <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;">
                     联系人
                   </td>
                   </td>
                   <td colspan="9">
                     <div
-                      class="td_proj_content td_align_left"
+                      class="td_proj_content td_align_left wrapper"
                       v-html="patientPrint.diagnose"
                     ></div>
                   </td>
     printThisInfo() {
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
-
       const style =
         "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border-collapse: collapse; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
       const style1 =
-        "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content table { width: 100%; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 22px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 22px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 22px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
+        "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content table { width: 100%; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 22px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 22px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 22px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} .wrapper {white-space: pre-wrap;} }";
       if(this.org_id != 10206 && this.org_id !=0){
         console.log('1111111');
 
 .el-select-dropdown {
   z-index: 998 !important;
 }
+.wrapper {
+  white-space: pre-wrap;
+}
 </style>