Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/drug/drug_stock.js

@@ -670,4 +670,13 @@ export function getDrugPatientName(params){
     method:"Get",
     params:params,
   })
+}
+
+export function ModityDrugCodeWarehouseInfo(data){
+ 
+  return request({
+    url:"/api/drug/modifydrugcodewarehouseinfo",
+    method:"post",
+    data:data,
+  })
 }

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -108,7 +108,7 @@
           <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/outpatientCharges/outpatientChargesManagement.vue

@@ -498,12 +498,12 @@
                               </el-button>
 
 
-                              <el-button
-                                size="small"
-                                @click="open(101,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
-                                type="primary"
-                              >撤销当前就诊所有结算明细
-                              </el-button>
+<!--                              <el-button-->
+<!--                                size="small"-->
+<!--                                @click="open(101,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"-->
+<!--                                type="primary"-->
+<!--                              >撤销当前就诊所有结算明细-->
+<!--                              </el-button>-->
 
                               <el-button
                                 v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1 ||  items.curMonthPrescriptions.order.order_status == 3"

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -140,7 +140,7 @@
 <!--                          </div>-->
                         <div style="display:flex;flez-wrap:wrap;font-size:16px;">
                           <div style="width:33%;">公务员医疗补助：{{info.new_order.cvlserv_pay?info.new_order.cvlserv_pay:0}}元</div>
-                          <div style="width:33%;">企业补充医疗保险基金支出：{{info.new_order.cvlserv_pay?info.new_order.cvlserv_pay:0}}元</div>
+                          <div style="width:33%;">企业补充医疗保险基金支出：{{info.new_order.hifes_pay?info.new_order.hifes_pay:0}}元</div>
                         </div>
                       </td>
                       <td style="font-size:16px;">合计：{{info.new_order.medfee_sumamt}}元</td>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -5773,7 +5773,7 @@ export default {
       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

@@ -169,6 +169,14 @@
             {{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
@@ -183,6 +191,26 @@
       >
       </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>
 
@@ -190,7 +218,7 @@
 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",
 
@@ -232,7 +260,7 @@ export default {
     //获取入库单数据
     this.getlist()
     this.getDrugWarehouseInfoPrint() 
-
+    
   },
   data() {
     return {
@@ -269,9 +297,48 @@ export default {
       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

@@ -341,9 +341,8 @@
 
           <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>
@@ -354,7 +353,7 @@
             </template>
           </el-table-column>
 
-         
+
 
           <el-table-column
             label="操作"
@@ -553,7 +552,7 @@ export default {
 
       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
@@ -782,7 +781,7 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params---------",params)
-         
+
           EditDrugWarehouse(
             params,
             this.warehousing_time,
@@ -903,7 +902,7 @@ export default {
            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:""}
@@ -911,7 +910,7 @@ export default {
             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]);
 
@@ -927,7 +926,7 @@ export default {
                }
             }
 
-          
+
           }
           this.warehouse = response.data.data.warehousing;
           this.storehouse_id = response.data.data.warehousing.storehouse_id
@@ -1081,10 +1080,10 @@ export default {
         }
     },
     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)
         }