hah阿凡达

src/xt_pages/role/admin.vue

@@ -248,13 +248,13 @@
           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> 
+          @click="toAutoDiagnose">检验</el-button>  -->
 
 
 

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -1249,8 +1249,11 @@ export default {
     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

@@ -542,8 +542,11 @@ export default {
     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

@@ -310,10 +310,12 @@
 
     <el-dialog
       title="耗材追溯码"
+       @open="openDialog"
       :visible.sync="dialogVisible"
       width="40%">
       <span>
         <el-input
+         ref="inputRef"
          @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
@@ -482,6 +484,11 @@
       }
     },
     methods: {
+      openDialog(){
+       this.$nextTick(() => {
+        this.$refs.inputRef.focus()
+       });
+     },
       handleSave: function() {
         if (this.recordInfo.recordData.length <= 0) {
           this.$message.error('请添加入库信息')
@@ -1059,9 +1066,11 @@
      },
      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

@@ -1061,8 +1061,11 @@ export default {
      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

@@ -1493,11 +1493,20 @@
         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
@@ -3887,6 +3896,11 @@
         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

@@ -59,7 +59,7 @@
               </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)}}