修改华侨医院bug

src/xt_pages/data/components/templateTable.vue

@@ -1,32 +1,37 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button size="small" class="filter-item" style="float:right;" @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
+      <el-button size="small" class="filter-item" style="float:right;" @click="handleCreate" type="primary"
+                 icon="el-icon-circle-plus-outline">{{$t('table.add')}}
+      </el-button>
     </div>
-    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row style="width: 100%;min-height:500px;">
+    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list"
+              v-loading="listLoading" border fit highlight-current-row style="width: 100%;min-height:500px;">
       <!-- <el-table-column align="center" :label="$t('table.id')" width="65" @click="handleUpdate(scope.row)">
         <template slot-scope="scope">
           <span>{{scope.row.id}}</span>
         </template>
       </el-table-column> -->
-      <el-table-column  align="center" label="标题">
+      <el-table-column align="center" label="标题">
         <template slot-scope="scope">
           <!-- <span @click="handleUpdate(scope.row)">{{scope.row.name}}</span> -->
-          <span >{{scope.row.title}}</span>
+          <span>{{scope.row.title}}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" label="内容">
         <template slot-scope="scope">
-          <span>{{scope.row.content}}</span>
+          <span v-html="scope.row.content">{{scope.row.content}}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" :label="$t('table.actions')" width="230" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-           <el-button icon="el-icon-edit-outline" type="primary" size="small" @click="handleUpdate(scope.row)"></el-button>
+            <el-button icon="el-icon-edit-outline" type="primary" size="small"
+                       @click="handleUpdate(scope.row)"></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="删除" placement="top">
-            <el-button icon="el-icon-delete" v-if="scope.row.status!='deleted'" size="small" type="danger" @click="handleModifyStatus(scope.row,'deleted')">
+            <el-button icon="el-icon-delete" v-if="scope.row.status!='deleted'" size="small" type="danger"
+                       @click="handleModifyStatus(scope.row,'deleted')">
             </el-button>
           </el-tooltip>
 
@@ -41,15 +46,30 @@
     </div> -->
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
-      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="70px" >
-        <el-form-item label="标题"  prop="title">
+      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="70px">
+        <el-form-item label="标题" prop="title">
           <el-input v-model="temp.title" maxlength="100" placeholder="请输入标题"></el-input>
         </el-form-item>
-        <el-form-item label="内容" prop="content">
-          <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 4}" v-model="temp.content" placeholder="请输入内容"></el-input>
+
+        <el-form-item label="内容"  v-if="type == 'course_disease'">
+          <keep-alive>
+            <neditor ref="neditor"
+                     id="neditor"
+                     style="width: 600px"
+                     v-bind:r_content="temp.content">
+            </neditor>
+          </keep-alive>
+        </el-form-item>
+
+        <el-form-item label="内容" prop="content" v-else>
+          <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 4}" v-model="temp.content"
+                    placeholder="请输入内容"></el-input>
         </el-form-item>
+
+
         <el-form-item :label="$t('data_config.remark')">
-          <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 4}" placeholder="请输入备注" v-model="temp.remark"></el-input>
+          <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 4}" placeholder="请输入备注"
+                    v-model="temp.remark"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -60,9 +80,10 @@
     </el-dialog>
 
     <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">
-      <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="pvData" border fit highlight-current-row style="width: 100%">
-        <el-table-column prop="key" label="Channel"> </el-table-column>
-        <el-table-column prop="pv" label="Pv"> </el-table-column>
+      <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="pvData" border fit
+                highlight-current-row style="width: 100%">
+        <el-table-column prop="key" label="Channel"></el-table-column>
+        <el-table-column prop="pv" label="Pv"></el-table-column>
       </el-table>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogPvVisible = false">{{$t('table.confirm')}}</el-button>
@@ -73,270 +94,284 @@
 </template>
 
 <script>
-import {createConfig,createChildConfig,updateChildConfig, deleteChildConfig,updateTemplate} from '@/api/data'
-import waves from '@/directive/waves' // 水波纹指令
-import { parseTime } from '@/utils'
-import store from '@/store'
-import bus from '@/assets/eventBus'
-
+  import { createChildConfig, createConfig, deleteChildConfig, updateChildConfig, updateTemplate } from '@/api/data'
+  import waves from '@/directive/waves' // 水波纹指令
+  import { parseTime } from '@/utils'
+  import store from '@/store'
+  import bus from '@/assets/eventBus'
+  import Neditor from '@/components/Neditor'
 
-export default {
-  name: 'complexTable',
-  directives: {
-    waves
-  },
-  props: {
-    type: {
-      type: String,
-      default: 'patient'
-    }
-  },
-  data() {
-    return {
-      currentId: undefined,
-      tableKey: 0,
-      // list: null,
-      total: null,
-      listLoading: true,
-      listQuery: {
-        page: 1,
-        limit: 20,
-        importance: undefined,
-        title: undefined,
-        type: this.type,
-        sort: '+id'
-      },
-      importanceOptions: [1, 2, 3],
-      // calendarTypeOptions,
-      sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
-      statusOptions: ['published', 'draft', 'deleted'],
-      showReviewer: false,
-      temp: {
-        id: undefined,
-        parent_id: 0,
-        module: this.type,
-        org_id:0,
-        title: '',
-        content: '',
-        remark: ''
-      },
-      dialogFormVisible: false,
-      dialogStatus: '',
-      textMap: {
-        update: '修改',
-        create: '新增'
-      },
-      dialogPvVisible: false,
-      pvData: [],
-      rules: {
-        title: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-        content: [{ required: true, message: '请输入字段名', trigger: 'blur' }]
-      },
-      downloadLoading: false
-    }
-  },
-  // watch: {
-  //   'temp.config_field':function(){
-  //       this.temp.config_field =  this.temp.config_field.replace(/[^A-Za-z]/g,'');
-  //   }
-  // },
-  computed:{
-    list: function() {
-      // const list = store.getters.configlist[this.type]
-      // this.total = list.length
-      return store.getters.configlist[this.type]
-    }
-  },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
+  export default {
+    name: 'complexTable',
+    directives: {
+      waves
     },
-    typeFilter(type) {
-      return calendarTypeKeyValue[type]
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    fieldChange:function(newValue){
-      this.temp.config_field = newValue.replace(/[^A-Za-z]/g,'');
+    components: {
+      Neditor
     },
-    handleRowChange(currentRow, oldCurrentRow){
-      if(currentRow != undefined){
-        this.currentId = currentRow.id
-        bus.$emit('parentChangeId',currentRow)
+    props: {
+      type: {
+        type: String,
+        default: 'patient'
       }
     },
-    getList() {
-      this.listLoading = false
-      // setTimeout(() => {
-      //     this.listLoading = false
-      //   }, 1 * 1000)
+    beforeMount(){
+
+
     },
-    handleFilter() {
-      this.listQuery.page = 1
-      this.getList()
+    data() {
+      return {
+        currentId: undefined,
+        tableKey: 0,
+        // list: null,
+        total: null,
+        listLoading: true,
+        listQuery: {
+          page: 1,
+          limit: 20,
+          importance: undefined,
+          title: undefined,
+          type: this.type,
+          sort: '+id'
+        },
+        importanceOptions: [1, 2, 3],
+        // calendarTypeOptions,
+        sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
+        statusOptions: ['published', 'draft', 'deleted'],
+        showReviewer: false,
+        temp: {
+          id: undefined,
+          parent_id: 0,
+          module: this.type,
+          org_id: 0,
+          title: '',
+          content: '',
+          remark: ''
+        },
+        dialogFormVisible: false,
+        dialogStatus: '',
+        textMap: {
+          update: '修改',
+          create: '新增'
+        },
+        dialogPvVisible: false,
+        pvData: [],
+        rules: {
+          title: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+          content: [{ required: true, message: '请输入字段名', trigger: 'blur' }]
+        },
+        downloadLoading: false
+      }
     },
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.getList()
+    // watch: {
+    //   'temp.config_field':function(){
+    //       this.temp.config_field =  this.temp.config_field.replace(/[^A-Za-z]/g,'');
+    //   }
+    // },
+    computed: {
+      list: function() {
+        // const list = store.getters.configlist[this.type]
+        // this.total = list.length
+        return store.getters.configlist[this.type]
+      }
     },
-    handleCurrentChange(val) {
-      this.listQuery.page = val
+    filters: {
+      statusFilter(status) {
+        const statusMap = {
+          published: 'success',
+          draft: 'info',
+          deleted: 'danger'
+        }
+        return statusMap[status]
+      },
+      typeFilter(type) {
+        return calendarTypeKeyValue[type]
+      }
+    },
+    created() {
       this.getList()
     },
-    handleModifyStatus(row, status) {
-      this.temp = Object.assign({}, row); // copy obj
-      this.$confirm("此操作将永久删除该配置项, 是否继续?", "提示", {
-        confirmButtonText: "确 定",
-        cancelButtonText: "取 消",
-        type: "warning"
-      }).then(() => {
-          const tempData = Object.assign({}, this.temp);
+    methods: {
+      fieldChange: function(newValue) {
+        this.temp.config_field = newValue.replace(/[^A-Za-z]/g, '')
+      },
+      handleRowChange(currentRow, oldCurrentRow) {
+        if (currentRow != undefined) {
+          this.currentId = currentRow.id
+          bus.$emit('parentChangeId', currentRow)
+        }
+      },
+      getList() {
+        this.listLoading = false
+        // setTimeout(() => {
+        //     this.listLoading = false
+        //   }, 1 * 1000)
+      },
+      handleFilter() {
+        this.listQuery.page = 1
+        this.getList()
+      },
+      handleSizeChange(val) {
+        this.listQuery.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.listQuery.page = val
+        this.getList()
+      },
+      handleModifyStatus(row, status) {
+        this.temp = Object.assign({}, row) // copy obj
+        this.$confirm('此操作将永久删除该配置项, 是否继续?', '提示', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          const tempData = Object.assign({}, this.temp)
           deleteChildConfig(tempData).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack
-              reject("error");
+              reject('error')
             }
             if (response.data.state === 0) {
-              this.$message.error(response.data.msg);
+              this.$message.error(response.data.msg)
             }
 
-            const result = response.data.data.dataconfig;
-            store.dispatch("updateParentConfigList", [tempData, "delete"]).then(() => {
-                next();
-              });
-          });
+            const result = response.data.data.dataconfig
+            store.dispatch('updateParentConfigList', [tempData, 'delete']).then(() => {
+              next()
+            })
+          })
 
           this.$message({
-            type: "success",
-            message: "删除成功!"
-          });
+            type: 'success',
+            message: '删除成功!'
+          })
         })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除"
-          });
-        });
-    },
-    resetTemp() {
-      this.temp = {
-        id: undefined,
-        parent_id: 0,
-        module: this.type,
-        org_id:0,
-        title: '',
-        content: '',
-        remark: ''
-      }
-    },
-    handleCreate() {
-      this.resetTemp()
-      this.dialogStatus = 'create'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    createData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          createConfig(this.temp).then(response => {
-            if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            })
+          })
+      },
+      resetTemp() {
+        this.temp = {
+          id: undefined,
+          parent_id: 0,
+          module: this.type,
+          org_id: 0,
+          title: '',
+          content: '',
+          remark: ''
+        }
+      },
+      handleCreate() {
+        this.resetTemp()
+        this.dialogStatus = 'create'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      createData() {
+        this.$refs['dataForm'].validate((valid) => {
+          if(this.type == "course_disease"){
+            this.temp.content = this.$refs.neditor.content;
+          }
+
+          if (valid) {
+            createConfig(this.temp).then(response => {
+              if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack
                 reject('error')
-            }
-            if (response.data.state === 0) {
-              this.$message.error(response.data.msg);
-            }
-            const result = response.data.data.dataconfig
-            // 更新store
-            store.dispatch('updateConfigList',result).then(() => {
+              }
+              if (response.data.state === 0) {
+                this.$message.error(response.data.msg)
+              }
+              const result = response.data.data.dataconfig
+              // 更新store
+              store.dispatch('updateConfigList', result).then(() => {
 
-            })
+              })
 
-            this.dialogFormVisible = false
+              this.dialogFormVisible = false
 
-            this.$message.success("创建成功")
-          })
-        }
-      })
-    },
-    handleUpdate(row) {
-      this.temp = Object.assign({}, row); // copy obj
-      this.dialogStatus = "update";
-      this.dialogFormVisible = true;
-      this.$nextTick(() => {
-        this.$refs["dataForm"].clearValidate();
-      });
-    },
-    updateData() {
-      this.$refs["dataForm"].validate(valid => {
-        if (valid) {
-          const tempData = Object.assign({}, this.temp);
-          updateTemplate(tempData).then(response => {
-            if (!response.data) {
-              // 由于mockjs 不支持自定义状态码只能这样hack
-              reject("error");
-            }
-            if (response.data.state === 0) {
-              this.$message.error(response.data.msg);
+              this.$message.success('创建成功')
+            })
+          }
+        })
+      },
+      handleUpdate(row) {
+        this.temp = Object.assign({}, row) // copy obj
+        this.dialogStatus = 'update'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      updateData() {
+        this.$refs['dataForm'].validate(valid => {
+          if (valid) {
+            const tempData = Object.assign({}, this.temp)
+            if(this.type == "course_disease"){
+              tempData.content = this.$refs.neditor.content;
             }
+            updateTemplate(tempData).then(response => {
+              if (!response.data) {
+                // 由于mockjs 不支持自定义状态码只能这样hack
+                reject('error')
+              }
+              if (response.data.state === 0) {
+                this.$message.error(response.data.msg)
+              }
 
-            const result = response.data.data.dataconfig;
-            store.dispatch("updateParentConfigList", [result, "update"]).then(() => {
-                next();
-              });
+              const result = response.data.data.dataconfig
+              store.dispatch('updateParentConfigList', [result, 'update']).then(() => {
+                next()
+              })
 
-            this.dialogFormVisible = false;
+              this.dialogFormVisible = false
 
-            this.$message.success("更新成功")
-          });
-        }
-      });
-    },
-    handleDelete(row) {
+              this.$message.success('更新成功')
+            })
+          }
+        })
+      },
+      handleDelete(row) {
 
-      this.$message.success("删除成功")
+        this.$message.success('删除成功')
 
-      const index = this.list.indexOf(row)
-      this.list.splice(index, 1)
-    },
-    handleFetchPv(pv) {
-      fetchPv(pv).then(response => {
-        this.pvData = response.data.pvData
-        this.dialogPvVisible = true
-      })
-    },
-    handleDownload() {
-      this.downloadLoading = true
-      import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
-        const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
-        const data = this.formatJson(filterVal, this.list)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: 'table-list'
+        const index = this.list.indexOf(row)
+        this.list.splice(index, 1)
+      },
+      handleFetchPv(pv) {
+        fetchPv(pv).then(response => {
+          this.pvData = response.data.pvData
+          this.dialogPvVisible = true
         })
-        this.downloadLoading = false
-      })
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'timestamp') {
-          return parseTime(v[j])
-        } else {
-          return v[j]
-        }
-      }))
+      },
+      handleDownload() {
+        this.downloadLoading = true
+        import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
+          const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
+          const data = this.formatJson(filterVal, this.list)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: 'table-list'
+          })
+          this.downloadLoading = false
+        })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => {
+          if (j === 'timestamp') {
+            return parseTime(v[j])
+          } else {
+            return v[j]
+          }
+        }))
+      }
     }
   }
-}
 </script>

src/xt_pages/data/template.vue

@@ -31,10 +31,10 @@ export default {
         { path: 'data/template', name: '模版配置' },
       ],
       tabMapOptions: [
-        { label: this.$t("data_config.education"), key: 'education' },
-        { label: this.$t("data_config.summary"), key: 'summary' },
+        { label: this.$t("data_config.education"), key: 'education'},
+        { label: this.$t("data_config.summary"), key: 'summary'},
         { label: this.$t("data_config.course_disease"), key: 'course_disease' },
-        { label: this.$t("data_config.rescue_record"), key: 'rescue_record' }
+        { label: this.$t("data_config.rescue_record"), key: 'rescue_record'}
       ],
       activeName: 'education',
       createdTimes: 0

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

@@ -285,10 +285,14 @@
             <el-form-item label="失衡综合症症状: ">
 
               <el-select v-model="form.disequilibrium_syndrome_option">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+                <!--<el-option v-for="item in this.$store.getters.disequilibrium_syndrome_option" :label="item.name" :value="item.id"-->
+                           <!--:key="item.id"></el-option>-->
+
+
+                <el-input v-model="form.disequilibrium_syndrome_option" readonly @focus="showDialog('8')"></el-input>
 
-                <el-option v-for="item in this.$store.getters.disequilibrium_syndrome_option" :label="item.name" :value="item.id"
-                           :key="item.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -583,7 +587,7 @@
         data['hemostasis_opera'] = this.form.hemostasis_opera ? parseFloat(this.form.hemostasis_opera) : 0
         data['tremor_noise'] = this.form.tremor_noise ? parseFloat(this.form.tremor_noise) : 0
         data['disequilibrium_syndrome'] = this.form.disequilibrium_syndrome ? parseFloat(this.form.disequilibrium_syndrome) : 0
-        data['disequilibrium_syndrome_option'] = this.form.disequilibrium_syndrome_option ? parseFloat(this.form.disequilibrium_syndrome_option) : 0
+        data['disequilibrium_syndrome_option'] = this.form.disequilibrium_syndrome_option
         data['arterial_tube'] = this.form.arterial_tube ? parseFloat(this.form.arterial_tube) : 0
         data['intravenous_tube'] = this.form.intravenous_tube ? parseFloat(this.form.intravenous_tube) : 0
         data['dialyzer'] = this.form.dialyzer ? parseFloat(this.form.dialyzer) : 0
@@ -667,6 +671,14 @@
             this.InnerDialogProps.selected = this.form.in_advance_reason
             this.InnerDialogProps.isShowTextArea = false
             break
+
+          case '8':
+            this.InnerDialogProps.values = this.$store.getters.disequilibrium_syndrome_option
+            this.InnerDialogProps.titles = '失衡综合症症状'
+            this.InnerDialogProps.type = 'disequilibrium_syndrome_option'
+            this.InnerDialogProps.selected = this.form.disequilibrium_syndrome_option
+            this.InnerDialogProps.isShowTextArea = false
+            break
         }
       },
       selectActualTreatmentHour(val) {
@@ -698,6 +710,9 @@
           case 'in_advance_reason':
             this.form.in_advance_reason = val.value.join(',')
             break
+          case 'disequilibrium_syndrome_option':
+            this.form.disequilibrium_syndrome_option = val.value.join(',')
+            break
 
           default:
             break

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -178,6 +178,7 @@
 
       },
       getValue: function() {
+        this.multipleSelection = []
         for (let i = 0; i < this.propForm.goods.length; i++) {
           for (let key in this.propForm.goods[i]) {
             if (key != 'index') {

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -171,6 +171,7 @@
         this.$refs.table.setCurrentRow(null)
       },
       getValue: function() {
+        this.multipleSelection = []
         for (let i = 0; i < this.propForm.goods.length; i++) {
           for (let key in this.propForm.goods[i]) {
             if (key != 'index') {
@@ -182,7 +183,6 @@
             }
           }
         }
-
         const obj = {
           selectedGoodInfo: this.multipleSelection,
         }

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -176,6 +176,7 @@
         // prop
         isVisibility: false,
         propForm: {
+          goods:[],
           goodType: [],
           goodInfo: [],
           goodUnit: [],

src/xt_pages/user/courseOfDisease.vue

@@ -58,7 +58,8 @@
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
                 <div class="content">
-                  {{ current_select_record == null ? '' : current_select_record.content }}
+                  <span v-if="current_select_record" v-html="current_select_record.content">{{current_select_record.content }}</span>
+                  <span v-else></span>
                 </div>
               </div>
             </el-col>
@@ -66,7 +67,7 @@
         </div>
       </div>
       <!-- </div> -->
-      <el-dialog title="新增病程记录" width="40%" top="5vh" :visible.sync="show_dialog">
+      <el-dialog title="新增病程记录" width="50%" top="5vh" :visible.sync="show_dialog">
         <div>
           <div class="new_record_form">
             <div class="cell clearfix">
@@ -85,7 +86,13 @@
 
 
             <div class="textarea_panel">
-              <el-input v-model="new_content" type="textarea" rows="6" resize="none"></el-input>
+              <keep-alive>
+                <neditor ref="neditor"
+                         id="editor"
+                         style="width: 600px"
+                         v-bind:r_content="new_content">
+                </neditor>
+              </keep-alive>
             </div>
 
             <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
@@ -99,7 +106,7 @@
       </el-dialog>
 
 
-      <el-dialog title="修改病程记录" width="40%" top="5vh" :visible.sync="show_edit_dialog">
+      <el-dialog title="修改病程记录" width="50%" top="5vh" :visible.sync="show_edit_dialog">
         <div>
           <div class="new_record_form">
             <div class="cell clearfix">
@@ -118,7 +125,14 @@
 
 
             <div class="textarea_panel">
-              <el-input v-model="edit_new_content" type="textarea" rows="6" resize="none"></el-input>
+              <!--<el-input v-model="edit_new_content" type="textarea" rows="6" resize="none"></el-input>-->
+              <keep-alive>
+                <neditor ref="edit_neditor"
+                         id="edit_editor"
+                         style="width: 600px"
+                         v-bind:r_content="edit_new_content">
+                </neditor>
+              </keep-alive>
             </div>
 
             <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
@@ -138,6 +152,8 @@
 
 <script>
   import PatientSidebar from './components/PatientSidebar'
+  import Neditor from '@/components/Neditor'
+
   import {
     createCourseOfDiseaseRecord,
     deleteCourseOfDiseaseRecords,
@@ -151,7 +167,8 @@
     name: 'CourseOfDisease',
     components: {
       PatientSidebar,
-      BreadCrumb
+      BreadCrumb,
+      Neditor
     },
     data() {
       return {
@@ -252,6 +269,7 @@
         return ''
       },
       modifyAction: function() {
+        this.edit_new_content = this.$refs.edit_neditor.content;
         if (this.edit_new_content.length == 0) {
           this.$message.error('请填写病程内容')
           return
@@ -283,6 +301,7 @@
       },
 
       createAction: function() {
+        this.new_content = this.$refs.neditor.content;
         if (this.new_content.length == 0) {
           this.$message.error('请填写病程内容')
           return