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

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

             }
           }
 
-          if(this.$store.getters.xt_user.org_id == 0 || this.this.$store.getters.xt_user.org_id == 10138 || this.this.$store.getters.xt_user.org_id == 10278 || this.this.$store.getters.xt_user.org_id == 10610 ||  this.this.$store.getters.xt_user.org_id == 10537 ) {
+          if(this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610 ||  this.$store.getters.xt_user.org_id == 10537 ) {
             for (let i = 0; i < array.length; i++) {
               if (array[i].drug_code.length == 0) {
                 this.$message.error(array[i].drug_name + " 药品溯源码不能为空");
               }
             }
           }
-          return
+
 
           if (this.recordInfo.recordData.length <= 0) {
             this.$message.success("请添加入库商品");

src/xt_pages/stock/stockInOrderAdd.vue

               array[i].packing_price = array[i].packing_price.toString()
             }
 
-            if(this.$store.getters.xt_user.org_id == 0 || this.this.$store.getters.xt_user.org_id == 10138 || this.this.$store.getters.xt_user.org_id == 10278 || this.this.$store.getters.xt_user.org_id == 10610 ||  this.this.$store.getters.xt_user.org_id == 10537 ) {
+            if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610 ||  this.$store.getters.xt_user.org_id == 10537 ) {
               for (let i = 0; i < array.length; i++) {
                 if (array[i].good_code.length == 0) {
                   this.$message.error(array[i].good_name  + " 溯源码不能为空");

src/xt_pages/user/sickHistory_new.vue

   createNewSickHistoryRecord,
   deleteSickHistoryRecords,
   getNewSickHistory,
-  ModifySickHistoryRecord,
-  getSickHistoryByPatient
+  ModifySickHistoryRecord
 } from '@/api/patient'
 import { parseTime } from '@/utils'
 import BreadCrumb from '@/xt_pages/components/bread-crumb' 
       uploading_new_record: false,
       templates: this.$store.getters.configlist.sick_history,
       select_template:"",
-      new_content: '',
+      new_content: "",
       edit_new_content: '',
       edit_sick_history_time: '',
       selectingRows: [],
       return uParseTime(time, '{y}-{m}-{d}')
     },
     getCurrentChange(val){
-       console.log("VAL---------------",val)
+      
+      console.log("new_content2222222222222222222---------------",val.content)
+      this.new_content = ""
+      this.new_content = val.content
+      // var ue = UE.getEditor('editor')
+      // ue.setContent(val.content)
+     
       this.record_time = this.getTime(val.record_time)
       this.id = val.id
-      this.content = val.content
       this.guominyaowu_desc = val.hypersusceptibility_desc
-
-      this.is_fumotouxishi = val.is_fumo_dialysis_history
-      this.is_hypersusceptibility  = val.is_shenyizhi_history
+      this.shen_fumo = val.is_fumo_dialysis_history
+      this.shen_yizhi  = val.is_shenyizhi_history
+      this.shen_guomi = val.is_hypersusceptibility
+      this.patient_id = val.patient_id
+     
+     
+      
     }
   }
 }