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

src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue

         condition: "1",
         posture: "1",
         sick_condition: "1",
-        danger_level: "1",
+        danger_level: "2",
         intake: "1",
         nutrition: "1",
         psychological_assessment: "1",
           accepts.posture = 1
           accepts.consciousness =1
           accepts.appetite =1
-          accepts.danger_level=1
+          accepts.danger_level=2
           console.log("this.precaution_arr",this.precaution_arr)
           this.receiveTreatmentAsses.way =1
           this.receiveTreatmentAsses.consciousness =2

src/xt_pages/role/admin.vue

           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toCheckQuery">库存检验脚本</el-button> -->
+<!-- 
+        <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toAutoDiagnose">检验</el-button>  -->
 
 
 

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

     changeText(event){
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
+        // var textarea = ""
+        // textarea += this.textarea + ","
+        // this.textarea = textarea
         var textarea = ""
-        textarea += this.textarea + ","
+         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
         this.textarea = textarea
 
       }

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

     changeText(event){
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
+        // var textarea = ""
+        // textarea += this.textarea + ","
+        // this.textarea = textarea
         var textarea = ""
-        textarea += this.textarea + ","
+         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
         this.textarea = textarea
 
       }

src/xt_pages/stock/stockInOrderAdd.vue

 
     <el-dialog
       title="耗材追溯码"
+       @open="openDialog"
       :visible.sync="dialogVisible"
       width="40%">
       <span>
         <el-input
+         ref="inputRef"
          @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
       }
     },
     methods: {
+      openDialog(){
+       this.$nextTick(() => {
+        this.$refs.inputRef.focus()
+       });
+     },
       handleSave: function() {
         if (this.recordInfo.recordData.length <= 0) {
           this.$message.error('请添加入库信息')
      },
      changeText(event){
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+    
       if (event.key === 'Enter') {
+
         var textarea = ""
-        textarea += this.textarea + ","
+         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
         this.textarea = textarea
 
       }

src/xt_pages/stock/stockInOrderEdit.vue

      changeText(event){
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
+        // var textarea = ""
+        // textarea += this.textarea + ","
+        // this.textarea = textarea
         var textarea = ""
-        textarea += this.textarea + ","
+         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
         this.textarea = textarea
 
       }

src/xt_pages/user/courseOfDisease_new.vue

         var params = {
           id:this.id,
           patient_id:this.patient_id,
-          record_date:this.getTimeThree(this.record_date),
+          record_date:"",
           content:this.new_content,
           admin_user_id:this.admin_user_id,
         }
+        if(this.id == 0){
+          params.record_date = this.getTimeThree(this.record_date)
+        }
+        if(this.id > 0){
+          params.record_date = this.record_date
+        }
         console.log("params",params)
+
+      
+
         createNewCourseOfDiseaseRecord(params).then(response => {
          if(response.data.state == 1){
            var msg = response.data.data.msg
         this.$refs.editor.contents = this.$refs.editor.contents +this.option_context
         this.option_dialog = false
       },
+      toContentPint(){
+        console.log("hhhhhhhhhhhhhhhhhhhh",this.$refs.editor)
+        this.$refs.editor.contents =  this.$refs.editor.contents + this.$refs.editorOne.contents
+        this.library_dialog = false
+      }
 
 
     },

src/xt_pages/user/coursePrint.vue

               </div>
             </div>
 
-            <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;float:right" v-if="org_id == 0||org_id ==9671 || org_id == 10440 || org_id == 10131 || org_id==9970 || org_id == 10567 || org_id == 10724">
+            <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;float:right">
              医生签名：
              <span v-if="setAdminUserES(item.recorder?item.recorder:item.recorder) == ''">
                   {{getName(item.recorder)}}

src/xt_pages/user/doctorAdvice.vue

         .catch(() => {});
     },
     DeleteGroupAdvice(groupno, row) {
+      console.log("patinet_id =======",row)
       this.$confirm("确认删除这组医嘱?", "医嘱删除", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",