2025 5 12

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -1487,8 +1487,13 @@ export default {
         }
       }else{ //耗材
         if (event.key === 'Enter') {
+
+           const halfWidth = this.textarea.replace(/[\uff01-\uff5e]/g, ch => String.fromCharCode(ch.charCodeAt(0) - 0xfee0));
+            // 2. 移除中文空格（全角空格转半角）
+          const normalizedSpace = halfWidth.replace(/\u3000/g, ' ');
+          console.log("normalizedSpace----------",normalizedSpace)
           var textarea = ""
-          textarea += this.textarea + ","
+          textarea += normalizedSpace + ","
           this.textarea = textarea
         }
       }

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

@@ -465,14 +465,17 @@
                             <tbody>
                             <tr>
                                 <td width="70">抗凝方式:</td>
-                                <td width="90">
+                                <td width="90" v-if="record.prescription.anticoagulant==2">
                                     <label-box :isChecked="record.prescription.anticoagulant==2?true:false" showValue='普通肝素'></label-box>
                                 </td>
+                                <td width="90" v-if="record.prescription.anticoagulant==15">
+                                    <label-box :isChecked="record.prescription.anticoagulant==15?true:false" showValue='甲磺酸萘莫司他'></label-box>
+                                </td>
                                 <td width="10">(</td>
                                 <td width="35">首剂</td>
                                 <td width="50">
                                     <div class="under-line">&nbsp;
-                                    <span v-if="record.prescription.anticoagulant==2">{{record.prescription.anticoagulant_shouji}}</span>
+                                    <span v-if="record.prescription.anticoagulant==2 || record.prescription.anticoagulant==15">{{record.prescription.anticoagulant_shouji}}</span>
                                     </div>
                                 </td>
                                 <td width="20">mg</td>
@@ -480,14 +483,14 @@
                                 <td width="35">追加</td>
                                 <td width="50">
                                     <div class="under-line">&nbsp;
-                                    <span v-if="record.prescription.anticoagulant==2">{{record.prescription.anticoagulant_weichi}}</span>
+                                    <span v-if="record.prescription.anticoagulant==2 || record.prescription.anticoagulant==15">{{record.prescription.anticoagulant_weichi}}</span>
                                     </div>
                                 </td>
                                 <td width="40">mg/h</td>
                                 <td width="35">总量</td>
                                 <td width="50">
                                     <div class="under-line">&nbsp;
-                                    <span v-if="record.prescription.anticoagulant==2">{{record.prescription.anticoagulant_zongliang}}</span>
+                                    <span v-if="record.prescription.anticoagulant==2 || record.prescription.anticoagulant==15">{{record.prescription.anticoagulant_zongliang}}</span>
                                     </div>
                                 </td>
                                 <td width="20">mg</td>

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -597,14 +597,17 @@
                   <tbody>
                     <tr>
                       <td width="70">抗凝方式:</td>
-                      <td width="90">
+                      <td width="90" v-if="prescription.anticoagulant == 2">
                         <label-box :isChecked="prescription.anticoagulant == 2 ? true : false" showValue='普通肝素'></label-box>
                       </td>
+                      <td width="90" v-if="prescription.anticoagulant == 15">
+                        <label-box :isChecked="prescription.anticoagulant == 15 ? true : false" showValue='甲磺酸萘莫司他'></label-box>
+                      </td>
                       <td width="10">(</td>
                       <td width="35">首剂</td>
                       <td width="50">
                         <div class="under-line">&nbsp;
-                          <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_shouji }}</span>
+                          <span v-if="prescription.anticoagulant == 2 || prescription.anticoagulant == 15">{{ prescription.anticoagulant_shouji }}</span>
                         </div>
                       </td>
                       <td width="20">mg</td>
@@ -612,14 +615,14 @@
                       <td width="35">追加</td>
                       <td width="50">
                         <div class="under-line">&nbsp;
-                          <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_weichi }}</span>
+                          <span v-if="prescription.anticoagulant == 2 || prescription.anticoagulant == 15">{{ prescription.anticoagulant_weichi }}</span>
                         </div>
                       </td>
                       <td width="40">mg/h</td>
                       <td width="35">总量</td>
                       <td width="50">
                         <div class="under-line">&nbsp;
-                          <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_zongliang }}</span>
+                          <span v-if="prescription.anticoagulant == 2 || prescription.anticoagulant == 15">{{ prescription.anticoagulant_zongliang }}</span>
                         </div>
                       </td>
                       <td width="20">mg</td>

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -5,10 +5,15 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       药品名称:<span>{{getName(this.$route.query.drug_id)}}</span>&nbsp;
-       库存: {{this.$route.query.over_plus}}
+       药品名称:<span>{{getName(this.drug_id)}}</span>&nbsp;
+       库存: 
+       <span>
+         <span v-if="getSumCount(this.drug_id)/drug.min_number>0">{{getSumCount(this.drug_id)/drug.min_number}}{{drug.max_unit}}</span> 
+         <span v-if="getSumCount(this.drug_id)%drug.min_number>0">{{getSumCount(this.drug_id)%drug.min_number}}{{drug.min_unit}}</span> 
+      </span>
+       <!-- {{this.$route.query.over_plus}} -->
        规格:<span>{{drug.dose}}{{drug.dose_unit}}*{{drug.min_number}}{{drug.min_unit}}/{{drug.max_unit}}</span>&nbsp;
-       厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
+       厂家:<span>{{manufacturer_name}}</span>&nbsp;
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -48,6 +53,37 @@
               :value="item.id">
             </el-option>
         </el-select>
+
+        <span>药品名称:</span>
+
+        <el-autocomplete
+            class="checkSearch"
+            popper-class="my-autocomplete"
+            v-model="drug_name"
+            :fetch-suggestions="querySearchAsync"
+            :trigger-on-focus="true"
+            placeholder="请输入药品名称"
+            @select="handleSelect"
+            style="width: 300px"
+          >
+        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+        <template slot-scope="{ item }">
+          <div class="name">
+            {{
+              item.drug_name +
+              item.dose +
+              item.dose_unit +
+              "*" +
+              item.min_number +
+              item.min_unit +
+              "/" +
+              item.max_unit +
+              "  " +
+              item.manufacturer
+            }}
+          </div>
+        </template>
+      </el-autocomplete>
         
         <span>
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
@@ -207,11 +243,14 @@
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getDrugStockFlow,getOutDrugStockFlow,getDrugCountList,getDrugFlow,getDrugFlowDetailByDrugId } from '@/api/drug/drug_stock'
+  import { postSearchDrugList } from "@/api/data";
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
     name: 'stockIn',
     created() {
+      this.drug_id = this.$route.query.drug_id
+      this.manufacturer_name = this.$route.query.manufacturer
        var nowDate = new Date();
       var nowYear = nowDate.getFullYear();
       var nowMonth = nowDate.getMonth() + 1;
@@ -296,11 +335,65 @@
         drug:{},
         houseList:[],
         patientList:[],
-        adviceMap:[]
+        adviceMap:[],
+        drug_id:0,
+        drug_name:"",
+        drugList:[],
+        manufacturerList:[],
+        dealerList:[],
+        manufacturer_name:""
+
       }
     },
     methods:{
-       getlist(){
+        handleSelect(val){
+          console.log("val-----------",val)
+          this.drug_name = val.drug_name
+          this.drug_id = val.id
+          this.manufacturer_name = val.manufacturer
+          this.getDrugFlow()
+        },
+        querySearchAsync(keyword, cb) {
+          let key = "";
+          if (keyword != undefined) {
+            key = keyword;
+          }
+          let searchArray = [];
+          postSearchDrugList(key, this.storehouse_id).then((response) => {
+            if (response.data.state == 1) {
+              searchArray = response.data.data.list;
+
+              var list = response.data.data.list;
+
+              this.drugList = list;
+              var manufacturerList = response.data.data.manufacturerList;
+              this.manufacturerList = manufacturerList;
+              var dealerList = response.data.data.dealerList;
+              this.dealerList = dealerList;
+              for (let i = 0; i < this.drugList.length; i++) {
+                for (let j = 0; j < this.manufacturerList.length; j++) {
+                  if (
+                    this.drugList[i].manufacturer == this.manufacturerList[j].id
+                  ) {
+                    this.drugList[i].manufacturer =
+                      this.manufacturerList[j].manufacturer_name;
+                  }
+                }
+
+                for (let z = 0; z < dealerList.length; z++) {
+                  if (this.drugList[i].dealer == this.dealerList[z].id) {
+                    this.drugList[i].dealer = this.dealerList[z].dealer_name;
+                  }
+                }
+              }
+
+              cb(this.drugList);
+            } else {
+              cb([]);
+            }
+          });
+        },
+        getlist(){
            var params = {
              drug_id:this.$route.query.drug_id,
              start_time:this.start_time,
@@ -528,13 +621,14 @@
 
      getDrugFlow(){
        var params = {
-          drug_id:this.$route.query.drug_id,
+          drug_id:this.drug_id,
           start_time:this.start_time,
           end_time:this.end_time,
           page:this.page,
           limit:this.limit,
           stock_type:this.stock_type,  
         }
+      console.log("param-------------",params)
        getDrugFlow(params).then(response=>{
           if(response.data.state ==1){
             var list = response.data.data.list
@@ -579,6 +673,13 @@
         }
         return name
      },
+     getSumCount(drug_id){
+        var sum_count = ""
+        if(drug_id == this.drug.id){
+          sum_count = this.drug.sum_count
+        }
+        return sum_count
+     },
      getPrice(id){
        var min_price = 0 
        if(id == this.drug.id){

src/xt_pages/stock/stockFlow.vue

@@ -5,10 +5,10 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       耗材名称:{{getGoodName(this.$route.query.id)}} &nbsp;
-       库存: {{this.$route.query.overCount}}{{packing_unit}} &nbsp;
-       规格:{{getSpecName(this.$route.query.id)}} &nbsp;
-       厂家:{{this.$route.query.manufacturer}}
+       耗材名称:{{getGoodName(this.good_id)}} &nbsp;
+       库存: {{getSumCount(this.good_id)}}{{packing_unit}} &nbsp;
+       规格:{{getSpecName(this.good_id)}} &nbsp;
+       厂家:{{manufacturer}}
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -49,6 +49,25 @@
             </el-option>
         </el-select>
 
+        <span>耗材名称: </span>
+
+        <el-autocomplete
+              class="checkSearch"
+              popper-class="my-autocomplete"
+              v-model="good_name"
+              :fetch-suggestions="querySearchAsync"
+              :trigger-on-focus="true"
+              placeholder="请输入耗材名称"
+              @select="handleSelect"
+              style="width:300px;"
+              :popper-append-to-body="true"
+            >
+              <i class="el-icon-search el-input__icon" slot="suffix"></i>
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+            </template>
+        </el-autocomplete>
+
         <span>
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
 
@@ -186,10 +205,12 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {getStockDrugCount,getStockFlow,getStockFlowOrderList} from "@/api/stock"
+  import {getStockDrugCount,getStockFlow,getStockFlowOrderList,postSearchGoodList} from "@/api/stock"
   export default {
     name: 'stockIn',
     created() {
+      this.manufacturer = this.$route.query.manufacturer
+      this.good_id = this.$route.query.id
       var nowDate = new Date();
       var nowYear = nowDate.getFullYear();
       var nowMonth = nowDate.getMonth() + 1;
@@ -213,6 +234,7 @@
       
       this.getStockFlow()
       this.packing_unit = this.$route.query.packing_unit
+    
     },
     components: {
       BreadCrumb
@@ -272,11 +294,61 @@
         good:{},
         houseList:[],
         patientList:[],
-        hisPrescription:[]
-
+        hisPrescription:[],
+        goodList:[],
+        currentIndex: 0,
+        manufacturerList:[],
+        dealerList:[],
+        good_id:0,
+        good_name:"",
+        manufacturer:""
       }
     },
     methods:{
+      handleSelect(val){
+        console.log("valo00000",val)
+        this.good_id = val.id
+        this.good_name = val.good_name
+        this.manufacturer = val.manufacturer
+        this.getStockFlow()
+      },
+      querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        postSearchGoodList(key,this.storehouse_id).then(response => {
+          if (response.data.state == 1) {
+
+             var list = response.data.data.list
+
+             this.goodList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             var dealer =  response.data.data.dealerList
+             this.dealerList = dealer
+             for(let i=0;i<this.goodList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                     this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+
+             for(let i=0;i<this.goodList.length;i++){
+               for(let j=0;j<this.dealerList.length;j++){
+                  if(this.goodList[i].dealer == this.dealerList[j].id){
+                    this.goodList[i].dealer = this.dealerList[j].dealer_name
+                  }
+               }
+             }
+
+             cb(this.goodList)
+          } else {
+            cb([])
+          }
+        })
+    },
      handleSizeChange(val) {
         this.limit = val
         this.getStockFlow()
@@ -465,7 +537,7 @@
         var params= {
           limit:this.limit,
           page:this.page,
-          good_id:this.$route.query.id,
+          good_id:this.good_id,
           start_time:this.start_time,
           end_time:this.end_time,
           is_sys:this.stock_type 
@@ -475,10 +547,14 @@
           if(response.data.state == 1){
             var list =  response.data.data.list
             var total = response.data.data.total
+            this.tableList = []
             this.tableList = list
             this.total = total
-            this.good = response.data.data.good
+           var good = response.data.data.good
+           this.good = {}
+           this.good = good
            var manufacturerList = response.data.data.manufacturerList
+           this.manufacturerList = []
            this.manufacturerList = manufacturerList
            this.houseList = response.data.data.houseList
            this.patientList = response.data.data.patients
@@ -498,6 +574,14 @@
         }
         return storehouse_name
      },
+     getSumCount(id){
+       var sum_count = 0
+       if(id == this.good.id){
+        sum_count = this.good.sum_count
+       }
+       return sum_count
+       
+     },
      getGoodName(id){
        
        var good_name =  ""

src/xt_pages/stock/stockInOrderAdd.vue

@@ -142,6 +142,26 @@
             </template>
           </el-table-column>
 
+          <el-table-column align="center" width="100">
+            <template slot="header" slot-scope="scope">
+              <span>拆零次数</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                style="padding-top: 10px"
+              >
+                <div style="display: flex">
+                  <el-input
+                    type="number"
+                    placeholder="请输入入库数量"
+                    v-model="scope.row.split_of_number"
+                    style="width: 100px"
+                  ></el-input>
+                </div>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
           <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>零售价<span style="color: red">*</span></span>
@@ -674,6 +694,7 @@
         tempObj['good_code'] = ""
         tempObj['good_code_cnt'] = ''
         tempObj["good_code_count"] =''
+        tempObj['split_of_number'] = 24
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -852,6 +873,12 @@
              if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
              }
+
+             if(this.recordInfo.recordData[i].split_of_number>0){
+              this.recordInfo.recordData[i].split_of_number = parseInt(this.recordInfo.recordData[i].split_of_number) 
+             }else{
+              this.recordInfo.recordData[i].split_of_number=0
+             }
               for(let j=0;j<this.manufacturerList.length;j++){
                  if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
 
@@ -868,6 +895,8 @@
               }
               this.recordInfo.recordData[i].warehousing_count = this.recordInfo.recordData[i].warehousing_count.toString()
             }
+
+           
             const loading = this.$loading({
               lock: true,
               text: 'Loading',
@@ -911,6 +940,7 @@
                   list[i].good_name = list[i].GoodInfo.good_name
                   list[i].name = list[i].GoodInfo.specification_name +"/"+ list[i].GoodInfo.packing_unit
                   list[i].good_code = list[i].good_code
+                  list[i].split_of_number = list[i].split_of_number
                 }
                 this.recordInfo.recordData = []
                 this.recordInfo.recordData = list
@@ -1095,10 +1125,20 @@
      },
      changeText(event){
 
-      var  textAreaList = this.textarea.split(",")
+        // 1. 转换为半角字符（英文输入法标准）
+        const halfWidth = this.textarea.replace(/[\uff01-\uff5e]/g, ch => 
+          String.fromCharCode(ch.charCodeAt(0) - 0xfee0)
+        );
+        
+        // 2. 移除中文空格（全角空格转半角）
+      const normalizedSpace = halfWidth.replace(/\u3000/g, ' ');
+
+      console.log("normalizedSpace----------",normalizedSpace)
+
+      var  textAreaList = normalizedSpace.split(",")
       if (event.key === 'Enter') {
         var textarea = ""
-         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+         textarea += normalizedSpace.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
          var  parts = textarea.split(',')
          for(let i=0;i<textAreaList.length;i++){
            if(parts[parts.length-2] == textAreaList[i]){
@@ -1177,7 +1217,8 @@
       tempObj['id']= 0
       tempObj['register_number'] = ''
       tempObj['good_code'] = ''
-        tempObj['good_code_cnt'] = ''
+      tempObj['good_code_cnt'] = ''
+      tempObj['split_of_number'] = 24
 
 
       this.recordInfo.recordData.push(tempObj)

src/xt_pages/stock/stockInOrderEdit.vue

@@ -166,6 +166,25 @@
 
             </template>
           </el-table-column>
+          <el-table-column align="center" width="100">
+            <template slot="header" slot-scope="scope">
+              <span>拆零次数</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                style="padding-top: 10px"
+              >
+                <div style="display: flex">
+                  <el-input
+                    type="number"
+                    placeholder="请输入入库数量"
+                    v-model="scope.row.split_of_number"
+                    style="width: 100px"
+                  ></el-input>
+                </div>
+              </el-form-item>
+            </template>
+          </el-table-column>
           <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>进货价<span style="color: red">*</span></span>
@@ -503,19 +522,41 @@ export default {
   },
   methods: {
     changeText(event){
-      var  textAreaList = this.textarea.split(",")
+
+      const halfWidth = this.textarea.replace(/[\uff01-\uff5e]/g, ch => 
+          String.fromCharCode(ch.charCodeAt(0) - 0xfee0)
+      );
+        
+        // 2. 移除中文空格（全角空格转半角）
+      const normalizedSpace = halfWidth.replace(/\u3000/g, ' ');
+
+     
+      var  textAreaList = normalizedSpace.split(",")
       if (event.key === 'Enter') {
         var textarea = ""
-        textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-        var  parts = textarea.split(',')
-        for(let i=0;i<textAreaList.length;i++){
-          if(parts[parts.length-2] == textAreaList[i]){
+         textarea += normalizedSpace.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+         var  parts = textarea.split(',')
+         for(let i=0;i<textAreaList.length;i++){
+           if(parts[parts.length-2] == textAreaList[i]){
               this.$message.error("该条码已经存在,不能重复扫码")
-          }
-        }
+           }
+         }
         const uniqueStr = [...new Set(textarea.split(','))].join(',');
         this.textarea = uniqueStr
       }
+      // var  textAreaList = this.textarea.split(",")
+      // if (event.key === 'Enter') {
+      //   var textarea = ""
+      //   textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+      //   var  parts = textarea.split(',')
+      //   for(let i=0;i<textAreaList.length;i++){
+      //     if(parts[parts.length-2] == textAreaList[i]){
+      //         this.$message.error("该条码已经存在,不能重复扫码")
+      //     }
+      //   }
+      //   const uniqueStr = [...new Set(textarea.split(','))].join(',');
+      //   this.textarea = uniqueStr
+      // }
     },
     getGoodCode(val){
       var newArr = []
@@ -666,6 +707,7 @@ export default {
       tempObj["license_number"] = ""
       tempObj["packing_price"] = ""
       tempObj["good_code"] = ""
+      tempObj['split_of_number'] = 24
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -823,6 +865,12 @@ export default {
                   this.recordInfo.recordData[i].dealer = this.dealerList[z].id
                }
              }
+             if(this.recordInfo.recordData[i].split_of_number>0){
+              this.recordInfo.recordData[i].split_of_number = parseInt(this.recordInfo.recordData[i].split_of_number) 
+             }else{
+              this.recordInfo.recordData[i].split_of_number=0
+             }
+           
              this.recordInfo.recordData[i].warehousing_count = this.recordInfo.recordData[i].warehousing_count.toString() 
           }
          
@@ -872,6 +920,7 @@ export default {
                 list[i].good_name = list[i].GoodInfo.good_name
                 list[i].name = list[i].GoodInfo.specification_name
                 list[i].good_code = list[i].good_code
+                list[i].split_of_number = list[i].split_of_number
                }
               this.recordInfo.recordData = []
               this.recordInfo.recordData = list
@@ -909,6 +958,8 @@ export default {
             response.data.data.info[i].good_name = response.data.data.info[i].GoodInfo.good_name
             response.data.data.info[i].name = response.data.data.info[i].GoodInfo.specification_name + "/"+response.data.data.info[i].GoodInfo.packing_unit
             response.data.data.info[i].packing_unit = response.data.data.info[i].GoodInfo.packing_unit
+
+            response.data.data.info[i].split_of_number = response.data.data.info[i].split_of_number
             
             if(response.data.data.info[i].manufacturer == 0){
               response.data.data.manufacturer = ""
@@ -946,6 +997,7 @@ export default {
             tempObj["license_number"] = ""
             tempObj["register_number"] = ""
             tempObj["good_code"] = ""
+            tempObj['split_of_number'] = 24
             this.recordInfo.recordData.push(tempObj);
           }
         }