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

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -435,7 +435,7 @@
          width="40%">
        <span>
         <el-input
-          @input="changeText"
+          @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
@@ -575,10 +575,13 @@ export default {
          }
       })
     },
-    changeText(){
-      var textarea = ""
-      textarea += this.textarea + ","
-      this.textarea = textarea
+    changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+      }
     },
     tt() {},
     async fun3() {

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -288,7 +288,7 @@
          width="40%">
        <span>
         <el-input
-          @input="changeText"
+          @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
@@ -865,10 +865,16 @@ export default {
          }
       })
     },
-    changeText(){
-      var textarea = ""
-      textarea += this.textarea + ","
-      this.textarea = textarea
+    changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        console.log("textarea-=----------------------",textarea)
+        this.textarea = textarea
+      }
+   
+
     }
   },
 };

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -314,12 +314,7 @@
               {{ scope.row.advice_spc_five }}
            </template>
         </el-table-column>
-       <el-table-column align="center" label="封管液" v-if="dialysisSett.sealing_fluid_dispose == 1">
-           <template slot-scope="scope">
-             <span>{{scope.row.xt_assesment_after_dislysis.sealing_fluid_dispose}} </span> 
-           </template>
-        </el-table-column>
-
+      
         <el-table-column align="center" label="葡萄糖"  v-if="dialysisSett.glucose==1">
            <template slot-scope="scope">
              <span>{{scope.row.dialysis_solution.amylaceum?scope.row.dialysis_solution.amylaceum:""}} </span> 

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -52,11 +52,10 @@
                 <td width="100" v-if="dialysisSett.sealing_fluid_dispose == 1">封管液</td>
                 <td width="100"  v-if="dialysisSett.glucose==1">葡萄糖</td>
                 <td width="100"  v-if="dialysisSett.blood_flow_volume==1">血流量</td>
-                <td  v-if="dialysisSett.sealing_fluid_dispose==1">封管液</td>
                 <td v-if="dialysisSett.cuhong_set==1">促红</td>
                 <td v-if="dialysisSett.zuoka_set == 1">左卡</td>
                 <td v-if="dialysisSett.difenzi_set == 1">低分子</td>
-                <td v-if="dialysisSett.advice_spc_three == 1">肝素钠</td>
+                <td v-if="dialysisSett.gansuna_set == 1">肝素钠</td>
                 <td v-if="dialysisSett.zhetangtie == 1">蔗糖铁</td>
                 <td v-if="dialysisSett.niaojimei_set == 1">尿激酶</td>
               </tr>
@@ -185,28 +184,23 @@
                    <span>{{item.dialysis_solution.blood_flow_volume?item.dialysis_solution.blood_flow_volume:""}}</span> 
                 </td>
                 
-                <td v-if="dialysisSett.sealing_fluid_dispose ==1">
-                  <span v-if="getBloodAccessOption(item.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
-                  <span v-else></span>
-                </td>
-                
-                
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+             
+                <td v-if="dialysisSett.cuhong_set==1">
                   {{ item.advice_spc }}
                 </td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                <td  v-if="dialysisSett.zuoka_set == 1">
                   {{ item.advice_spc_one }}
                 </td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                <td v-if="dialysisSett.difenzi_set == 1">
                   {{ item.advice_spc_two }}
                 </td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                <td v-if="dialysisSett.gansuna_set == 1">
                   {{ item.advice_spc_three }}
                 </td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                <td v-if="dialysisSett.zhetangtie == 1">
                   {{ item.advice_spc_four }}
                 </td>
-                <td v-if="org_id!=10587 && org_id!=10599 && org_id!=10629">
+                <td v-if="dialysisSett.niaojimei_set == 1">
                   {{ item.advice_spc_five }}
                 </td>
                </tr>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -181,7 +181,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
+        :page-sizes="[10, 50, 100,500,1000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"
@@ -342,6 +342,7 @@ export default {
       return name;
     },
     search: function() {
+      this.getGoodDetailPrintList()
       const Params = {
         page: this.page,
         limit: this.limit,
@@ -490,14 +491,18 @@ export default {
     },
     handleSelectionChange: function(val) {
       this.multipleSelection = val;
+      this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     handleSizeChange(val) {
       this.limit = val;
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     startTimeChange(val) {
 
@@ -508,6 +513,7 @@ export default {
       } else {
 
         this.GetCancelStock();
+        this.getGoodDetailPrintList()
 
       }
     },
@@ -519,10 +525,12 @@ export default {
       } else {
 
         this.GetCancelStock();
+        this.getGoodDetailPrintList()
       }
     },
     getAllQuery(){
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     getTimestamp(time) {
       // 把时间日期转成时间戳
@@ -907,6 +915,7 @@ export default {
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
+          this.tableInfo = []
           this.tableInfo = list
         }
       })

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

@@ -174,7 +174,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
+        :page-sizes="[10, 50, 100,500,1000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"
@@ -473,7 +473,7 @@ export default {
      getDrugWarehouseInfoPrint(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-          
+            this.tabelePrintList = []
             this.tabelePrintList = list
             this.manufacturerList = response.data.data.manufacturerList
             this.dealerList = response.data.data.dealerList

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -419,6 +419,7 @@
       width="40%">
       <span>
         <el-input
+         @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
@@ -1183,8 +1184,18 @@ export default {
          return ""
         }
       }
-    }
+    },
+    changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+
+      }
+   },
   },
+ 
   created() {
     if (this.$route.path == "/Pharmacy/in/add") {
       this.crumbs = [

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -405,6 +405,7 @@
       width="40%">
       <span>
         <el-input
+         @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
@@ -532,6 +533,15 @@ export default {
     };
   },
   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

src/xt_pages/user/lapsoSummary.vue

@@ -20,6 +20,7 @@
              <span v-if="scope.row.lapse_type == 2">转出</span>
              <span v-if="scope.row.lapse_type == 3">死亡</span>
              <span v-if="scope.row.lapse_type == 4">院内转诊</span>
+             <span v-if="scope.row.lapse_type == 11">请假</span>
           </template>
         </el-table-column>
        <el-table-column prop="blood_access_part_id" label="转归分类" align="center">
@@ -121,10 +122,11 @@
                             <el-radio  label="2">转出</el-radio>
                             <el-radio  label="3">死亡</el-radio>
                             <el-radio  label="4">院内转诊</el-radio>
+                            <el-radio  label="11">请假</el-radio>
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
-                <el-col :span="24" v-if="lapseto == 2 || lapseto == 3 || lapseto == 4">
+                <el-col :span="24" v-if="lapseto == 2 || lapseto == 3 || lapseto == 4 || lapseto ==11">
                     <el-form-item label="转归类型:"> 
                         <el-radio-group style="padding: 10px;" v-model="lapse_type">
                             <el-radio  label="1">转入</el-radio>
@@ -313,10 +315,11 @@
                           <el-radio  label="2">转出</el-radio>
                           <el-radio  label="3">死亡</el-radio>
                           <el-radio  label="4">院内转诊</el-radio>
+                          <el-radio  label="11">请假</el-radio>
                     </el-radio-group>
                   </el-form-item>
               </el-col>
-              <el-col :span="24" v-if="lapseto == 2">
+              <el-col :span="24" v-if="lapseto == 2  || lapseto == 3 || lapseto == 4 || lapseto ==11">
                   <el-form-item label="转归类型:"> 
                       <el-radio-group style="padding: 10px;" v-model="lapse_type">
                           <el-radio  label="1">转入</el-radio>
@@ -716,7 +719,7 @@
 
       },
       savePatientLapse(){
-          if(this.lapse_type!=1 && this.lapse_reason == ""){
+          if(this.lapse_type!=1 && this.lapse_type!=11 && this.lapse_reason == ""){
              this.$message.error("转出或者死亡原因不能为空!")
              return false
           }
@@ -793,7 +796,7 @@
 
       },
       updatePatientLapse(){
-        if (this.lapse_type !=1 &&this.lapse_reason == ""){
+        if (this.lapse_type !=1 && this.lapse_type !=11 &&this.lapse_reason == ""){
              this.$message.error("转出或者死亡原因不能为空!")
              return false
         }

src/xt_pages/user/patients.vue

@@ -842,13 +842,13 @@
           { value: 1, label: '转出', source: 0, lapseto: 2 },
           { value: 2, label: '留治', source: 0, lapseto: 1 },
           { value: 3, label: '死亡', source:0,  lapseto: 3 },
-          { value: 4, label: "转院", source: 0, lapseto: 4 },
-          { value: 5, label: "肾移植", source: 0, lapseto: 5 },
-          { value: 6, label: "转腹透", source: 0, lapseto: 6 },
-          { value: 7, label: "出院", source: 0, lapseto: 7 },
-          { value: 8, label: "好转", source: 0, lapseto: 8 },
-          { value: 9, label: "放弃治疗", source: 0, lapseto: 9 },
-          { value: 10, label: "其他状态", source: 0, lapseto: 10 },
+          // { value: 4, label: "转院", source: 0, lapseto: 4 },
+          // { value: 5, label: "肾移植", source: 0, lapseto: 5 },
+          // { value: 6, label: "转腹透", source: 0, lapseto: 6 },
+          // { value: 7, label: "出院", source: 0, lapseto: 7 },
+          // { value: 8, label: "好转", source: 0, lapseto: 8 },
+          // { value: 9, label: "放弃治疗", source: 0, lapseto: 9 },
+          // { value: 10, label: "其他状态", source: 0, lapseto: 10 },
           { value: 11, label: "请假", source: 0, lapseto: 11 },
         ],
         scheduling: [