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

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -435,7 +435,7 @@ export default {
   methods: {
     openDialog(){
       this.$nextTick(() => {
-        this.$refs.inputRef.$refs.input.focus()
+        this.$refs.inputRef.focus()
       });
     },
     changevalue(row){
@@ -1357,7 +1357,7 @@ export default {
     },
     changeText(event){
 
-     
+     console.log("event------------",event.key)
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
        

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -437,10 +437,13 @@
 
     <el-dialog
       title="药品追溯码"
+      @open="openDialog"
       :visible.sync="dialogVisible"
       width="40%">
       <span>
         <el-input
+        
+         ref="inputRef"
          @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
@@ -596,6 +599,11 @@ export default {
     };
   },
   methods: {
+    openDialog(){
+      this.$nextTick(() => {
+        this.$refs.inputRef.focus()
+      });
+    },
     changeDrugCode(row,index){
       this.textarea=""
       this.textarea = row.drug_code

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -399,11 +399,13 @@
     </div>
 
     <el-dialog
+     @open="openDialog"
       title="药品追溯码"
       :visible.sync="dialogVisible"
       width="40%">
       <span>
         <el-input
+         ref="inputRef"
          @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
@@ -532,6 +534,11 @@ export default {
     };
   },
   methods: {
+    openDialog(){
+      this.$nextTick(() => {
+        this.$refs.inputRef.focus()
+      });
+    },
     changeText(event){
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {

src/xt_pages/user/dialysisSolution.vue

@@ -1556,14 +1556,66 @@
         console.log("value",val)
         this.InnerDialogProps.visibility = false
         switch (val.type) {
-          case 'dialyzer_perfusion_apparatus':
-            this.addPlan.dialyzer_perfusion_apparatus = val.value.join(',')
+
+            case 'dialyzer_perfusion_apparatus':
+            var newArr = []
+            if(this.dialyzerPerfusionApparatus!=null && this.dialyzerPerfusionApparatus.length>0){
+              for(let i=0;i<this.dialyzerPerfusionApparatus.length;i++){
+                for(let j=0;j<val.value.length;j++){
+                   if(this.dialyzerPerfusionApparatus[i].name == val.value[j]){
+                     newArr.push(val.value[j])
+                   }
+                }
+              }
+            }
+            if(newArr!=null && newArr.length>0){
+
+              this.addPlan.dialyzer_perfusion_apparatus = newArr.join(',')
+            }else{
+              this.addPlan.dialyzer_perfusion_apparatus = ""
+            }
+
             break
           case 'dialyzers':
-            this.dialysis_dialyszers = val.value.join(',')
+            
+            // this.dialysis_dialyszers = val.value.join(',')
+            // break
+            var newArr = []
+            if(this.dialyzers!=null && this.dialyzers.length >0){
+              for(let i=0;i<this.dialyzers.length;i++){
+                for(let j=0;j<val.value.length;j++){
+                  if(this.dialyzers[i].specification_name == val.value[j]){
+                      newArr.push(val.value[j])
+                  }
+                }
+              }
+            }
+            if(newArr!=null && newArr.length >0){
+             this.dialysis_dialyszers = newArr.join(',')
+            }else{
+              this.dialysis_dialyszers = ""
+            }
+
             break
           case 'irrigations':
-            this.dialysis_irrigation = val.value.join(',')
+            // this.dialysis_irrigation = val.value.join(',')
+            // break
+            var newArr = []
+            if(this.irrigations!=null && this.irrigations.length >0){
+              for(let i=0;i<this.irrigations.length;i++){
+                for(let j=0;j<val.value.length;j++){
+                  if(this.irrigations[i].specification_name == val.value[j]){
+                     newArr.push(val.value[j])
+                  }
+                }
+              }
+            }
+            if(newArr!=null && newArr.length>0){
+             this.dialysis_irrigation = newArr.join(',')
+            }else{
+              this.dialysis_irrigation = ""
+            }
+
             break
           case 'plasma_separator':
             this.addPlan.plasma_separator = val.value.join(',')