11月14日 库存扣减更新

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2310,7 +2310,7 @@
             //   }
             // })
             if (num == 0) {
-             
+
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {
                   this.$emit('change', this.patientInfo.id)
@@ -2482,10 +2482,6 @@
           this.$message.error('该处方已经结算，无法删除')
           return
         }
-        if (targetName == '处方1') {
-          this.$message.error('该处方无法删除')
-          return
-        }
         this.$confirm('处方删除后不可恢复，是否确认删除', '删除', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -204,6 +204,10 @@
                       <p>IUF+HD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
                   </span>
+                  <span v-if="item.mode_id == 'CVVHDF'">
+                      <p>IUF+HD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                  </span>
                </div>
               </div>
             </div>

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -262,6 +262,9 @@ export default {
               if(modeIdCount[i].mode_id == 19){
                modeIdCount[i].mode_id = "IUF+HD"
             }
+             if(modeIdCount[i].mode_id == 28){
+               modeIdCount[i].mode_id = "CVVHDF"
+            }
           }
           this.modeIdCount = modeIdCount
           let dataInfo = {}
@@ -423,6 +426,8 @@ export default {
             patients[i].mode_id = "HDF后置换"
         }else if(patients[i].mode_id == 19){
           patients[i].mode_id = "IUF+HD"
+        }else if(patients[i].mode_id == 28){
+          patients[i].mode_id = "CVVHDF"
         }
       }
     },
@@ -467,14 +472,25 @@ export default {
         console.log("DialysisData",this.DialysisData)
        for(let i=0;i<this.DialysisData.length;i++){
          this.DialysisData[i].index = i+1
-         this.DialysisData[i].dialysis_mode = this.getModeIdCount(this.DialysisData[i].patient_id)
+         this.DialysisData[i].HD = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HD")
+         this.DialysisData[i].HDF = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HDF")
+         this.DialysisData[i].HDHP = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HD+HP")
+         this.DialysisData[i].HP = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HP")
+         this.DialysisData[i].HF = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HF")
+         this.DialysisData[i].SCUF = this.getHdModeIdCount(this.DialysisData[i].patient_id,"SCUF")
+         this.DialysisData[i].IUF = this.getHdModeIdCount(this.DialysisData[i].patient_id,"IUF")
+         this.DialysisData[i].HFHDHP = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HFHD+HP")
+         this.DialysisData[i].HDFHP = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HDF+HP")
+         this.DialysisData[i].CRRT = this.getHdModeIdCount(this.DialysisData[i].patient_id,"CRRT")
+         this.DialysisData[i].OTR = this.getHdModeIdCount(this.DialysisData[i].patient_id,"腹水回输")
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
          this.DialysisData[i].total_count = this.getDialysisCount(this.DialysisData[i].patient_id)
        }
+       console.log("hhh2323323232",this.DialysisData)
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','姓名', '年龄', '透析号','透析模式','透析总次数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','dialysis_mode','total_count']
-        
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','total_count']
+
         const data = this.formatJson(filterVal, this.DialysisData)
        
         excel.export_json_to_excel({
@@ -495,6 +511,22 @@ export default {
             }
           })
        );
+     },
+     getHdModeIdCount(id,mode_name){
+        var count = 0
+        var arr = []
+        for(let i = 0;i<this.modeIdCount.length;i++){
+           if(id == this.modeIdCount[i].patient_id && this.modeIdCount[i].mode_id == mode_name){
+             arr.push(this.modeIdCount[i])
+           }
+        }
+        if(arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            count += arr[i].Count
+          }
+        }
+       
+        return count
      }
 
   },

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -62,7 +62,7 @@
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
        
-          <el-table-column align="center" width="230" fixed="left">
+         <el-table-column align="center" width="320" fixed="left">
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -76,7 +76,7 @@
                     placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:200px;"
+                    style="width:280px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -85,7 +85,7 @@
                  </el-autocomplete>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
               <span>规格&单位<span style="color: red">*</span></span>
             </template>
@@ -98,7 +98,7 @@
             </template>
           </el-table-column>
         
-          <el-table-column width="150" align="center">
+          <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>退库数量<span style="color: red">*</span></span>
             </template>
@@ -118,7 +118,7 @@
             
             </template>
           </el-table-column>
-          <el-table-column width="150" align="center">
+          <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>单价<span style="color: red">*</span></span>
             </template>

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -28,7 +28,7 @@
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
              max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
 
-          <el-table-column align="center" width="230">
+          <el-table-column align="center" width="320">
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -42,7 +42,7 @@
                     placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:200px;"
+                    style="width:280px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -53,7 +53,7 @@
           </el-table-column>
 
 
-         <el-table-column align="center" width="200">
+         <el-table-column align="center" width="140">
             
             <template slot="header" slot-scope="scope">
               <span>规格&单位<span style="color: red">*</span></span>

src/xt_pages/stock/cancelStockOrderPrint.vue

@@ -8,7 +8,7 @@
     <div class="app-container ">
       <div id="dialysis-print-box">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
-         <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;">{{orgName}}</div>
+         <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">耗材退库登记表</div>
 
           <div style="float: left;margin-bottom: 1px;">单据编号：{{it.order_number}}</div>

src/xt_pages/stock/drugs/cancelDrugOrderPrint.vue

@@ -8,7 +8,7 @@
     <div class="app-container ">
       <div id="dialysis-print-box">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
-         <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;">{{orgName}}</div>
+         <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品退库登记表</div>
 
           <div style="float: left;margin-bottom: 1px;">单据编号：{{it.order_number}}</div>

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -576,7 +576,7 @@ export default {
             cancelStock: this.recordInfo.recordData
           };
          console.log("params2222",params,this.return_time)
-        
+          
           postDrugCancelStock(
             params,
             this.return_time,

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

@@ -478,6 +478,7 @@ export default {
       return name
     },
      exportList(){
+        console.log("hhh233223232323",this.tabelePrintList)
         for(let i=0;i<this.tabelePrintList.length;i++){
           this.tabelePrintList[i].index = i+1
           this.tabelePrintList[i].drug_name = this.tabelePrintList[i].XtBaseDrug.drug_name
@@ -487,7 +488,7 @@ export default {
         
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'unit', 'min_unit','warehousing_count','price','total_price','remark']
+       const filterVal = ['index','drug_name', 'unit', 'max_unit','warehousing_count','price','total_price','remark']
        let obj = {'index':'合计','total_price':0}
        for(let i=0;i<this.tabelePrintList.length;i++){
          obj.total_price += this.tabelePrintList[i].price * this.tabelePrintList[i].warehousing_count

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

@@ -181,7 +181,7 @@
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-            <!-- {{scope.row.price * scope.row.count}} -->
+            
             {{scope.row.total_price}}
           </template>
         </el-table-column>
@@ -432,8 +432,12 @@ export default {
             is_total: 1,
             specification_name:"",
             ctime:"",
-            total_price:total_price.toFixed(2),
+            total_price:total_price,
           });
+         
+          for(let i=0;i<order.length;i++){
+            order[i].total_price = order[i].total_price.toFixed(2)
+          }
           this.tableData = order
            let objInfo = {}
           order.forEach((item,index)=>{
@@ -477,8 +481,8 @@ export default {
           for(let i=0;i<list.length;i++){
              list[i].total_price = list[i].count * list[i].price
           }
-         
-          this.tableList = list
+       
+          this.tableList = list 
           var total = response.data.data.total
           this.total = total
         } 

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -8,7 +8,7 @@
     <div class="app-container ">
       <div id="dialysis-print-box">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
-          <div style="font-size:22px;font-weight:bold;text-align:center;">{{ orgName }}</div>
+          <div style="font-size:22px;font-weight:bold;text-align:center;margin-top:40px">{{ orgName }}</div>
           <div class="order-title" style="font-size:18px;padding-top:0;">药品入库登记表</div>
 
           <div style="float: left;margin-bottom: 1px;">单据编号：{{it.warehousing_order}}</div>

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -688,7 +688,7 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params22222222222",params)
-        
+         
           EditDrugWarehouse(
             params,
             this.warehousing_time,

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -1162,6 +1162,7 @@ export default {
           this.$message.error("请勾选出库单")
           return
         }
+        console.log("hh2323232322323",this.exportList)
         for(let i=0;i<this.exportList.length;i++){
           if(this.exportList[i].dealer == 0){
             this.exportList[i].dealer = ""
@@ -1172,8 +1173,8 @@ export default {
           this.exportList[i].unit = this.exportList[i].dose + this.exportList[i].dose_unit + "*" + this.exportList[i].min_number + this.exportList[i].min_unit + "/"+this.exportList[i].max_unit
 
           this.exportList[i].total_price = (this.exportList[i].count * this.exportList[i].price).toFixed(2)
-          this.exportList[i].expiry_date  = this.getTime(this.exportList[i].expiry_date,"{y}-{h}-{d}")
-           this.exportList[i].product_date = this.getTime(this.exportList[i].product_date,"{y}-{h}-{d}")
+          this.exportList[i].expiry_date  = this.getTime(this.exportList[i].expire_date)
+           this.exportList[i].product_date = this.getTime(this.exportList[i].product_date)
           for(let j=0;j<this.manufacturerList.length;j++){
             if(this.exportList[i].manufacturer == this.manufacturerList[j].id){
               this.exportList[i].manufacturer = this.manufacturerList[j].manufacturer_name

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -8,7 +8,7 @@
     <div class="app-container ">
       <div id="dialysis-print-box">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
-         <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;">{{orgName}}</div>
+         <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
 
           <div style="float: left;margin-bottom: 1px;">单据编号：{{it.warehouse_out_order_number}}</div>

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -587,7 +587,7 @@
               'stockOut': this.recordInfo.recordData
             }
             console.log("param23322323233222323",params)
-          
+           
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -7,7 +7,7 @@
                 style="width: 200px;margin-left:10px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-               placeholder="请输入单据编号或操作人姓名"
+               placeholder="请输入药品名称"
                 />
                 <el-button
                 size="small"

src/xt_pages/stock/drugs/query.vue

@@ -110,32 +110,36 @@
             <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="出库数量" align="center">
+        <el-table-column prop="drug_name" label="出库数量" align="center" v-if="showOne">
            <template slot-scope="scope">
-             <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
-                <span>
-                 {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
-                </span>
-             </span>
-             <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span> -->
               <span>
                  {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
               </span>
            </template>
         </el-table-column>
+
+        <el-table-column prop="drug_name" label="出库数量" align="center" v-if="showTwo">
+           <template slot-scope="scope">
+           
+             <span>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
+             
+           </template>
+        </el-table-column>
         
-        <el-table-column prop="drug_name" label="剩余库存量" align="center">
+        <el-table-column prop="drug_name" label="剩余库存量" align="center" v-if="showThree">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
-               <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
-                {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
-               </span>
-
-               <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span> -->
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
             </div>
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="剩余库存量" align="center" v-if="showFour">
+           <template slot-scope="scope">
+            <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
+               <span>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>         
+            </div>
+           </template>
+        </el-table-column>
         <el-table-column prop="drug_name" label="操作" align="center" width="200px">
           <template slot-scope="scope">
             <el-button
@@ -254,6 +258,10 @@ import { min } from 'moment'
         cancelCountList:[],
         allCountList:[],
         org_id:"",
+        showOne:true,
+        showTwo:false,
+        showThree:true,
+        showFour:false,
       }
     },
     methods: {
@@ -395,8 +403,22 @@ import { min } from 'moment'
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-
-        this.getlist()
+        if(this.end_time == ""){
+          this.showOne = true
+          this.showTwo = false
+          this.showThree = true
+          this.showFour = false
+           this.getlist()
+        }
+        if(this.end_time !=""){
+          this.showOne = false
+          this.showTwo = true
+          this.showThree = false
+          this.showFour = true
+          this.getlist()
+          this.getDrugCountList()
+        }
+       
       }
 
     },
@@ -443,13 +465,17 @@ import { min } from 'moment'
            this.tableList[i].drug_type_name = this.getDrugType(this.tableList[i].drug_type)
            this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit +"*"+this.tableList[i].min_number+this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
            this.tableList[i].manufacturer_name = this.getManufacturerList(this.tableList[i].manufacturer)
-        
           this.tableList[i].inCount =  this.getWarehoseInfo(this.tableList[i].drug_warehouse_info)
-          this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-         }
+          if(this.end_time == 0){
+            this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+          }
+          if(this.end_time!=0){
+             this.tableList[i].outCount = this.getOutCount(this.tableList[i].id)+ this.getAutoCount(this.tableList[i].id)
+             this.tableList[i].overplusCount  = this.getWarehoseInfo(this.tableList[i].drug_warehouse_info) - this.getOutCount(this.tableList[i].id) - this.getAutoCount(this.tableList[i].id)
 
-         console.log("hhhhhhhadhfadf 列表",this.tableList)
+          }   
+         }
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','进货单价','厂家','入库数量','出库数量','剩余库存量']
          const filterVal = ['index', 'drug_type_name', 'drug_name','unit','last_price','manufacturer_name','inCount','outCount','overplusCount']
@@ -666,7 +692,7 @@ import { min } from 'moment'
        }
        return str+str_min
      },
-      getCancelCount(id){
+     getCancelCount(id){
         var count= 0
         for(let i=0;i<this.cancelCountList.length;i++){
           if(id == this.cancelCountList[i].drug_id){

src/xt_pages/stock/stockInOrderEdit.vue

@@ -99,7 +99,7 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         > 
-         <el-table-column align="center" width="200">
+         <el-table-column align="center" width="300">
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -113,7 +113,7 @@
                     placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:160px;"
+                    style="width:250px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -150,21 +150,18 @@
 
             </template>
           </el-table-column>
-          <!-- <el-table-column align="center" width="200">
+       
+         <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
-              <span>规格名称<span style="color: red">*</span></span>
+              <span>批号<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 15px">
-                <el-input
-                  placeholder="请输入规格名称"
-                  v-model="scope.row.good_id"
-                  :value="specificationName(scope.row.good_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
-                ></el-input>
+              <el-form-item style="padding-top: 20px" :prop="'recordData.' + scope.$index + '.number'"
+                            :rules='tableRules.number' >
+                <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
               </el-form-item>
             </template>
-          </el-table-column> -->
+          </el-table-column>
 
           <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
@@ -256,19 +253,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column align="center" width="150">
-            <template slot="header" slot-scope="scope">
-              <span>批号</span>
-            </template>
-            <template slot-scope="scope">
-              <el-form-item style="padding-top: 20px">
-                <el-input
-                  placeholder="请输入批号"
-                  v-model="scope.row.number"
-                ></el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
+         
         
            <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
@@ -403,6 +388,9 @@ export default {
         expiry_date:[
          { required: true, message: '有效日期不能为空', trigge: 'blur' }
         ],
+        number:[
+            { required: true, message: '批号不能为空', trigge: 'blur' }
+        ],
       },
 
       total: "",

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -402,7 +402,6 @@ export default {
       const order_id = this.$route.query.id;
       const warehouse_out_time = this.$route.query.warehouse_out_time;
       this.GetConfigInfo();
-      // this.GetTotalCount(warehouse_out_time);
       this.GetOrderDetailOne(order_id)
       this.getList()
       this.getStockDrugCount()

src/xt_pages/user/patients.vue

@@ -320,6 +320,7 @@
           >
           </el-option>
         </el-select>
+        <el-button type="primary" size="small" style="float:right" @click="toExport">导出</el-button>
       </div>
 
       <el-table
@@ -463,7 +464,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="listQuery.page"
-        :page-sizes="[10, 20, 50, 100]"
+        :page-sizes="[10, 20, 50, 100,200,500,1000,2000]"
         :page-size="listQuery.limit"
         background
         style="margin-top:20px;"
@@ -604,6 +605,7 @@
             @size-change="handleSizeChangeOne"
             @current-change="handleCurrentChangeOne"
             :page-size="5"
+            :page-sizes="[10, 20, 50, 100,500,1000,2000]"
             background
             style="margin-top:20px;float: right"
             :total="value"
@@ -616,11 +618,10 @@
 <script>
   import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind } from '@/api/patient'
   import { generateLog } from '@/api/config'
-
   import QRCode from 'qrcodejs2'
   import Vue from 'vue'
   import { Base64 } from 'js-base64'
-  import { uParseTime } from '@/utils/tools'
+  import { jsGetAge,uParseTime } from '@/utils/tools'
   import { log } from 'util'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
@@ -1336,7 +1337,7 @@
         return new Date(time).getTime() / 1000
       },
       search() {
-        this.listQuery.limit = 700
+        
         this.listQuery.keywords = this.searchKey
         this.getList()
       },
@@ -1354,6 +1355,7 @@
             console.log('病人是', this.tableData)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
+           
           }
         })
       },
@@ -1515,6 +1517,70 @@
         }
 
       },
+     toExport(){
+      import('@/vendor/Export2Excel').then(excel => {
+      
+        console.log("hhhh323223",this.tableData)
+        for(let i=0;i<this.tableData.length;i++){
+          if(this.tableData[i].gender == 1){
+            this.tableData[i].genders = "男"
+          }
+          if(this.tableData[i].gender == 2){
+            this.tableData[i].genders = "女"
+          }
+          this.tableData[i].age_year = this.tranAge(this.tableData[i])
+          this.tableData[i].first_dialysis_date = this.getTime(this.tableData[i].first_dialysis_date)
+          if(this.tableData[i].lapseto == 0){
+            this.tableData[i].lapesetos = ""
+          }
+          if(this.tableData[i].lapseto == 1){
+            this.tableData[i].lapesetos = "留治"
+          }
+          if(this.tableData[i].lapseto == 2){
+            this.tableData[i].lapesetos = "转归"
+          }
+           if(this.tableData[i].source == 0){
+             this.tableData[i].sources = ""
+          }
+          if(this.tableData[i].source == 1){
+             this.tableData[i].sources = "门诊"
+          }
+           if(this.tableData[i].source == 2){
+             this.tableData[i].sources = "住院"
+          }
+         if(this.tableData[i].is_infectious == 0){
+             this.tableData[i].is_infectiouss = ""
+          }
+          if(this.tableData[i].is_infectious == 1){
+             this.tableData[i].is_infectiouss = "阴性"
+          }
+          if(this.tableData[i].is_infectious == 2){
+             this.tableData[i].is_infectiouss = "阳性"
+          }
+        }
+       
+        const tHeader = ['姓名', '性别', '身份证号码','年龄','透析号','首次治疗时间','本人电话','患者来源','治疗状态','传染病']
+        const filterVal = ['name', 'genders', 'id_card_no','age_year','dialysis_no','first_dialysis_date','phone','sources','lapesetos','is_infectiouss']
+        console.log("table",this.tableData)
+      
+        const data = this.formatJson(filterVal, this.tableData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '患者名单'
+        })
+        this.downloadLoading = false
+     })
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]));
+    },
+    tranAge(val) {
+      if(val.birthday){
+        var birth = uParseTime(val.birthday, '{y}-{m}-{d}');
+        return jsGetAge(birth, '-');
+      }
+    },
     }
   }
   Vue.prototype.$QRCode = function() {

src/xt_pages/user/vascularAccess.vue

@@ -521,7 +521,8 @@
         },
         options:[
          {id:1,name:"启用"},
-         {id:2,name:"停用"}
+         {id:2,name:"停用"},
+         {id:3,name:"备用"}
         ],
         optionsPass:[
           {id:1,name:"流入-动脉"},