测试

config/dev.env.js

@@ -0,0 +1,16 @@
+// module.exports = {
+//   NODE_ENV: '"development"',
+//   ENV_CONFIG: '"dev"',
+//   BASE_API: '"https://api-dev"'
+// }
+module.exports = {
+  NODE_ENV: '"development"',
+  ENV_CONFIG: '"dev"',
+  BASE_API: '"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+
+  SSO_HOST: '"http://testsso.sgjyun.com"',
+  SRCM_HOST: '"http://test1.sgjyun.com"',
+  XT_HOST: '"http://xt.test.sgjyun.com"',
+  MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
+  CDM_HOST: '"http://cdm.test.sgjyun.com"',
+}

config/index.js

@@ -17,9 +17,9 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    host: 'xt.test.sgjyun.com',
+    // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
-    // host: 'localhost',
+    host: 'localhost',
     port:9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

config/prod.env.js

@@ -1,11 +1,11 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"prod"',
-  BASE_API: '"http://api.xt.kuyicloud.com"',
+  BASE_API: '"https://api.xt.kuyicloud.com"',
 
-  SSO_HOST: '"http://sso.kuyicloud.com"',
+  SSO_HOST: '"https://sso.kuyicloud.com"',
   SRCM_HOST: '"http://jk.kuyicloud.com"',
-  XT_HOST: '"http://xt.kuyicloud.com"',
+  XT_HOST: '"https://xt.kuyicloud.com"',
   MIRCO_MALL_HOST: '"http://mall.kuyicloud.com"',
   CDM_HOST: '"http://cdm.kuyicloud.com"',
 }

config/sit.env.js

@@ -0,0 +1,11 @@
+module.exports = {
+  NODE_ENV: '"production"',
+  ENV_CONFIG: '"sit"',
+  BASE_API: '"https://api.xt.test.sgjyun.com"',
+
+  SSO_HOST: '"https://testsso.sgjyun.com"',
+  SRCM_HOST: '"https://test1.sgjyun.com"',
+  XT_HOST: '"https://xt.test.sgjyun.com"',
+  MIRCO_MALL_HOST: '"https://mall.test.sgjyun.com"',
+  CDM_HOST: '"https://cdm.test.sgjyun.com"',
+}

src/api/schedule.js

@@ -58,4 +58,13 @@ export function GetWeekSchedulePrintInitData(date) {
         method: 'get',
         params: { date: date },
     })
-}
+}
+
+
+export function getUrgentScheduleInitData(params) {
+  return request({
+    url: '/api/schedule/urgentinit',
+    method: 'Get',
+    params: params
+  })
+}

src/components/Editor/index.vue

@@ -0,0 +1,81 @@
+<template>
+  <div>
+    <div :id="this.id"></div>
+  </div>
+</template>
+
+<script>
+
+
+  export default {
+    name: 'Editor',
+    props: ['id', 'r_content'],
+    data() {
+      return {
+        ue: '', //ueditor实例
+        content: '' //编辑器内容
+      }
+    },
+    methods: {
+      //初始化编辑器
+      initEditor() {
+        this.ue = UE.getEditor(this.id, {
+          initialFrameWidth: '100%',
+          initialFrameHeight: '350',
+          topOffset: '110',
+          toolbars:[[]],
+          // scaleEnabled: true,
+        })
+        //编辑器准备就绪后会触发该事件
+        this.ue.addListener('ready', () => {
+          //设置可以编辑
+          this.ue.setEnabled()
+          this.ue.setContent(this.r_content)
+        })
+        //编辑器内容修改时
+        this.selectionchange()
+      },
+
+      //编辑器内容修改时
+      selectionchange() {
+        this.ue.addListener('selectionchange', () => {
+          this.content = this.ue.getContent()
+        })
+      }
+
+    },
+
+    activated() {
+      //初始化编辑器
+      this.initEditor()
+    },
+    deactivated() {
+      //销毁编辑器实例，使用textarea代替
+      this.ue.destroy()
+      //重置编辑器，可用来做多个tab使用同一个编辑器实例
+      //this.ue.reset()
+      //如果要使用同一个实例,请注释destroy()方法
+    },
+
+    computed: {
+      // 利用计算属性返回prop里传过来的内容
+      revecive: function() {
+        return this.r_content
+      }
+    },
+
+    watch: {
+      // !!! 这里需要注意，需要一个watch来实时更新编辑器的内容
+      revecive: function() {
+        this.ue.setContent(this.r_content)
+      }
+    }
+  }
+</script>
+
+
+<style>
+  .edui-editor {
+    z-index: 60 !important;
+  }
+</style>

src/components/Neditor/index.vue

@@ -1,80 +1,80 @@
 <template>
-    <div>
-        <div :id="this.id"></div>
-    </div>
+  <div>
+    <div :id="this.id"></div>
+  </div>
 </template>
 
 <script>
 
 
-export default {
-    name:"Neditor",
-    props: ['id','r_content'],
+  export default {
+    name: 'Neditor',
+    props: ['id', 'r_content'],
     data() {
-        return {
-            ue: '', //ueditor实例
-            content: '', //编辑器内容
-        }
+      return {
+        ue: '', //ueditor实例
+        content: '' //编辑器内容
+      }
     },
     methods: {
-        //初始化编辑器
-        initEditor() {
-            this.ue = UE.getEditor(this.id, {
-                initialFrameWidth: '100%',
-                initialFrameHeight: '350',
-                topOffset:'110',
-                // scaleEnabled: true,
-            })
-            //编辑器准备就绪后会触发该事件
-            this.ue.addListener('ready',()=>{
-                //设置可以编辑
-                this.ue.setEnabled()
-                this.ue.setContent(this.r_content)
-            })
-            //编辑器内容修改时
-            this.selectionchange()
-        },
-        
+      //初始化编辑器
+      initEditor() {
+        this.ue = UE.getEditor(this.id, {
+          initialFrameWidth: '100%',
+          initialFrameHeight: '350',
+          topOffset: '110',
+          // scaleEnabled: true,
+        })
+        //编辑器准备就绪后会触发该事件
+        this.ue.addListener('ready', () => {
+          //设置可以编辑
+          this.ue.setEnabled()
+          this.ue.setContent(this.r_content)
+        })
         //编辑器内容修改时
-        selectionchange() {
-            this.ue.addListener('selectionchange', () => {
-                this.content = this.ue.getContent()
-            })
-        },
+        this.selectionchange()
+      },
+
+      //编辑器内容修改时
+      selectionchange() {
+        this.ue.addListener('selectionchange', () => {
+          this.content = this.ue.getContent()
+        })
+      }
 
     },
 
     activated() {
-        //初始化编辑器
-        this.initEditor()
+      //初始化编辑器
+      this.initEditor()
     },
     deactivated() {
-        //销毁编辑器实例，使用textarea代替
-        this.ue.destroy()
-        //重置编辑器，可用来做多个tab使用同一个编辑器实例
-        //this.ue.reset()
-        //如果要使用同一个实例,请注释destroy()方法
+      //销毁编辑器实例，使用textarea代替
+      this.ue.destroy()
+      //重置编辑器，可用来做多个tab使用同一个编辑器实例
+      //this.ue.reset()
+      //如果要使用同一个实例,请注释destroy()方法
     },
 
-    computed:{
-        // 利用计算属性返回prop里传过来的内容
-        revecive:function(){
-            return this.r_content
-        }
+    computed: {
+      // 利用计算属性返回prop里传过来的内容
+      revecive: function() {
+        return this.r_content
+      }
     },
 
-    watch:{
-        // !!! 这里需要注意，需要一个watch来实时更新编辑器的内容
-        revecive:function(){
-            this.ue.setContent(this.r_content)
-        }
+    watch: {
+      // !!! 这里需要注意，需要一个watch来实时更新编辑器的内容
+      revecive: function() {
+        this.ue.setContent(this.r_content)
+      }
     }
-}
+  }
 </script>
 
 
 <style>
   .edui-editor {
-      z-index: 60 !important;
+    z-index: 60 !important;
   }
-</style>
+</style>

src/router/index.js

@@ -1,7 +1,5 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-Vue.use(Router)
-
 /* Layout */
 import Layout from '@/views/layout/Layout'
 
@@ -17,22 +15,24 @@ import workforce from './modules/workforce'
 import service from './modules/service'
 import org from './modules/org'
 
+Vue.use(Router)
+
 /** note: submenu only apppear when children.length>=1
  *   detail see  https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
  **/
 
 /**
-* hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
-* alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
+ * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
+ * alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
 
-// 详见 xt_permission.xt_filterAsyncRouter 函数的逻辑
-is_menu: false               加载路由时验证用的(即该路由是否要在侧边栏展示，需要展示的即需要)，为 false 时表示该路由不需要进行权限验证
+ // 详见 xt_permission.xt_filterAsyncRouter 函数的逻辑
+ is_menu: false               加载路由时验证用的(即该路由是否要在侧边栏展示，需要展示的即需要)，为 false 时表示该路由不需要进行权限验证
 
-*                                if not set alwaysShow, only more than one route under the children
-*                                it will becomes nested mode, otherwise not show the root menu
-* redirect: noredirect           if `redirect:noredirect` will no redirct in the breadcrumb
-* name:'router-name'             the name is used by <keep-alive> (must set!!!)
-* meta : {
+ *                                if not set alwaysShow, only more than one route under the children
+ *                                it will becomes nested mode, otherwise not show the root menu
+ * redirect: noredirect           if `redirect:noredirect` will no redirct in the breadcrumb
+ * name:'router-name'             the name is used by <keep-alive> (must set!!!)
+ * meta : {
     title: 'title'               the name show in submenu and breadcrumb (recommend set)
     icon: 'svg-name'             the icon show in the sidebar,
     noCache: true                if true ,the page will no be cached(default is false)
@@ -41,38 +41,48 @@ is_menu: false               加载路由时验证用的(即该路由是否要
     is_menu: false               加载路由时验证用的，为 false 时表示该路由不需要进行权限验证
     hidden: false                加载路由时验证用的，is_menu 为true时才有作用，为 true 时表示该路由需要进行权限验证
   }
-**/
+ **/
 var _constant_router_map = [{
   path: '/token/verify',
   component: () => import('@/xt_pages/index/verify_token'),
   hidden: true
 },
-{
-  path: '/404',
-  component: () => import('@/views/errorPage/404'),
-  hidden: true
-},
-{
-  path: '/401',
-  component: () => import('@/views/errorPage/401'),
-  hidden: true
-},
-{
-  path: '',
-  component: Layout,
-  redirect: '/home',
-  children: [{
-    path: '/home',
-    component: () => import('@/xt_pages/home/index'),
-    name: 'home',
-    meta: {
-      title: 'home',
-      icon: 'dashboard',
-      noCache: true
-    }
-  }]
-},
-service
+  {
+    path: '/404',
+    component: () => import('@/views/errorPage/404'),
+    hidden: true
+  },
+  {
+    path: '/401',
+    component: () => import('@/views/errorPage/401'),
+    hidden: true
+  },
+  {
+    path: '',
+    component: Layout,
+    redirect: '/home',
+    children: [{
+      path: '/home',
+      component: () => import('@/xt_pages/home/index'),
+      name: 'home',
+      meta: {
+        title: 'home',
+        icon: 'dashboard',
+        noCache: true
+      }
+    }]
+  },
+  service,
+  // patient,
+  // workforce,
+  // weight_sign,
+  // dialysis,
+  // stock,
+  // qcd,
+  // data_dict,
+  // device,
+  // role,
+  // org
 ]
 
 var _asy_router_map = [

src/store/modules/globalConfig.js

@@ -490,13 +490,15 @@ const global_config = {
     ductus_arantii:[
       {id: 1, name: "正常"},
       {id: 2, name: "不畅"},
-      {id: 3, name: "血流不足(正接)"},
-      {id: 4, name: "血流不足(反接)"},
+      {id: 3, name: "正接"},
+      {id: 4, name: "反接"},
       {id: 5, name: "血栓"},
       {id: 6, name: "缝线脱落"},
       {id: 7, name: "导管脱落"},
       {id: 8, name: "感染"},
       {id: 9, name: "破损"},
+      {id: 10, name: "血流不足"},
+
     ],
     dialysis_process:[
       {id: 1, name: "完成"},

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>
+            <editor ref="editor"
+                     id="editor"
+                     style="width: 600px"
+                     v-bind:r_content="temp.content">
+            </editor>
+          </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 Editor from '@/components/Editor'
 
-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: {
+      Editor
     },
-    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/batch_print/batch_print_order.vue

@@ -321,7 +321,8 @@
                     <div class="inline_block">
                       透析机号：
                       <div class="under_line" style="width: 150px;">
-                        {{record.device_zone?record.device_zone.name:''}}{{record.device_number&&record.dialysis_order?record.device_number.number:''}}
+                        {{record.device_zone?record.device_zone.name:''}} {{record.dialysis_order&&record.dialysis_order.device_number&&record.dialysis_order.device_number.number.length > 0?record.dialysis_order.device_number.number:record.device_number.number}}
+                        <!--{{record.device_number&&record.dialysis_order?record.device_number.number:''}}-->
                       </div>
                     </div>
                     <div class="inline_block" style="float: right;">

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -69,7 +69,7 @@
                       </div>
                       <div class="inline_block" style="margin-left: 30px;">
                         透析机编号：
-                        <div class="under_line" style="width: 100px;">{{record.dialysis_order&&record.dialysis_order.device_number&&record.dialysis_order.device_number.number.length > 0?record.dialysis_order.device_number.number:''}}</div>
+                        <div class="under_line" style="width: 100px;">{{record.dialysis_order&&record.dialysis_order.device_number&&record.dialysis_order.device_number.number.length > 0?record.dialysis_order.device_number.number:record.device_number.number}}</div>
                         型号:
                         <div class="under_line" style="width: 100px;">{{record.assessment_before_dislysis&&record.assessment_before_dislysis.machine_type&&record.assessment_before_dislysis.machine_type.length > 0 ? record.assessment_before_dislysis.machine_type:''}}</div>
                       </div>
@@ -84,7 +84,7 @@
                       <div class="inline_block"  style="margin-left: 30px;">
                         出血：
                         <check-box text="无"  :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'is_hemorrhage', 2)"></check-box>
-                        <check-box text="有" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'is_hemorrhage', 1)"></check-box>
+                        <check-box text="异常" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'is_hemorrhage', 1)"></check-box>
                         （&nbsp;
                         <check-box text="穿刺点渗血" :checked="record.assessment_before_dislysis&&record.assessment_before_dislysis.is_hemorrhage==1&&record.assessment_before_dislysis.hemorrhage.indexOf('穿刺点渗血')>-1?true:false"></check-box>
                         <check-box text="牙龈出血" :checked="record.assessment_before_dislysis&&record.assessment_before_dislysis.is_hemorrhage==1&&record.assessment_before_dislysis.hemorrhage.indexOf('牙龈出血')>-1?true:false"></check-box>
@@ -96,6 +96,7 @@
                         </div>
                         &nbsp;）
                       </div>
+
                     </div>
                     <div class="row" style="padding: 2px 0;line-height:19px;">
                       <div class="inline_block">
@@ -147,8 +148,9 @@
                         中心静脉导管：
                         <check-box text="正常" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '正常')"></check-box>
                         <check-box text="不畅" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '不畅')"></check-box>
-                        <check-box text="血流不足(正接)" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '血流不足(正接)')"></check-box>
-                        <check-box text="血流不足(反接)" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '血流不足(反接)')"></check-box>
+                        <check-box text="血流不足" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '血流不足')"></check-box>
+                        (<check-box text="正接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '正接')"></check-box>/
+                        <check-box text="反接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '反接')"></check-box>)
                         <check-box text="血栓" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '血栓')"></check-box>
                         <check-box text="缝线脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '缝线脱落')"></check-box>
                         <check-box text="导管脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '导管脱落')"></check-box>
@@ -376,7 +378,7 @@
                         <check-box text="提前" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'dialysis_process', 2)"></check-box>
                         <div class="inline_block">
                           <div class="under_line" style="width: 30px;">
-                            {{record.assessment_after_dislysis&&record.assessment_after_dislysis.dialysis_process==2&&record.assessment_after_dislysis.actual_treatment_hour?record.assessment_after_dislysis.actual_treatment_hour:''}}
+                            {{record.assessment_after_dislysis&&record.assessment_after_dislysis.dialysis_process==2&&record.assessment_after_dislysis.in_advance_minute?record.assessment_after_dislysis.in_advance_minute:''}}
                           </div>
                           min
                         </div>
@@ -412,13 +414,13 @@
                         <check-box text="他人协助" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'hemostasis_opera', 2)"></check-box>
                         <check-box text="自己压迫" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'hemostasis_opera', 3)"></check-box>
                       </div>
-                      <div class="inline_block" style="margin-left: 30px;">
-                        实际超滤量：
-                        <div class="under_line" style="width: 50px;">
-                          {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:'/'}}
-                        </div>
-                        L
-                      </div>
+                      <!--<div class="inline_block" style="margin-left: 30px;">-->
+                        <!--实际超滤量：-->
+                        <!--<div class="under_line" style="width: 50px;">-->
+                          <!--{{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:'/'}}-->
+                        <!--</div>-->
+                        <!--L-->
+                      <!--</div>-->
                     </div>
                     <div class="row" style="padding: 2px 0;line-height:19px;">
                       <div class="inline_block">
@@ -673,22 +675,22 @@
                   </div>
                   <div class="row" style="padding: 2px 0;line-height:24px;">
                     <div class="inline_block">
-                      透析液(mol/l):
+                      透析液(mmol/L):
                       &emsp;Ca<sup>2+</sup>:
                       <div class="under_line" style="width: 60px;">
                         {{record.prescription&&record.prescription.calcium?getFloat(record.prescription.calcium):'/'}}
                       </div>
-                      mol/l
+                      mmol/L
                       &emsp;Na<sup>+</sup>:
                       <div class="under_line" style="width: 60px;">
                         {{record.prescription&&record.prescription.sodium?getFloat(record.prescription.sodium):'/'}}
                       </div>
-                      mol/l
+                      mmol/L
                       &emsp;K<sup>+</sup>:
                       <div class="under_line" style="width: 60px;">
                         {{record.prescription&&record.prescription.kalium?getFloat(record.prescription.kalium):'/'}}
                       </div>
-                      mol/l
+                      mmol/L
                     </div>
                     <div class="inline_block"
                         v-if="record.prescription != null &&record.prescription.displace_liqui_part == 0">
@@ -753,7 +755,7 @@
                     <div class="inline_block">
                       &emsp;实际超滤量:
                       <div class="under_line" style="width: 100px;">
-                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:'/'}}
+                        {{record.prescription&&record.prescription.ultrafiltration?record.prescription.ultrafiltration:'/'}}
                       </div>
                       L
                     </div>
@@ -1002,7 +1004,6 @@
       //   }
     },
     mounted() {
-      console.log(this.$store.getters.xt_user.fileds)
       this.loading = true
       var ids = this.$store.getters.temp_params.batch_print_dialysis_record_ids
       if (ids.length == 0) {
@@ -1221,7 +1222,6 @@
             this.records[recordIndex].advices2 = this.advice_groups_2
           }
 
-          console.log(' this.records[recordIndex].advices', this.records)
           this.operators = resp.data.medical_staffs
           if (this.operators.length > 0) {
             var operatorsLen = this.operators.length
@@ -1400,6 +1400,8 @@
             advices: []
           }
         )
+      },getNumber:function(record) {
+        console.log(record)
       }
     }
   }

src/xt_pages/dialysis/batch_print/option_check_box.vue

@@ -29,24 +29,26 @@ export default {
     /* font-size: 16px; */
 }
 .option_panel .check_box_panel {
-    white-space: nowrap; 
-    outline: none; 
-    display: inline-block; 
-    line-height: 1; 
-    position: relative; 
+    white-space: nowrap;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
     vertical-align: middle;
 }
 .option_panel .check_box_panel .check_box {
-    display: inline-block; 
-    position: relative; 
-    border: 1px solid #000; 
-    box-sizing: border-box; 
-    width: 14px; 
-    height: 14px; 
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
     background-color: #fff;
 }
 .check_box_panel .did_checked::after {
     content: "√";
-    font-size: 15px;
+    font-size: 10px;
+    margin-left: 2px;
+    position: absolute;
 }
 </style>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -20,7 +20,7 @@
         <li v-if="isShow('钙')">
           <label>钙: </label>
           <span class="content">{{calcium != '0'?calcium:""}}</span>
-          <span class="unit">{{calcium != '0'?"mmol/l":""}}</span>
+          <span class="unit">{{calcium != '0'?"mmol/L":""}}</span>
         </li>
         <li v-if="isShow('置换量')">
           <label>置换量 : </label>
@@ -56,7 +56,7 @@
         <li v-if="isShow('碳酸氢盐')">
           <label>碳酸氢盐 : </label>
           <span class="content">{{bicarbonate != '0'?bicarbonate:""}}</span>
-          <span class="unit">{{bicarbonate != '0'?"mmol/l":""}}</span>
+          <span class="unit">{{bicarbonate != '0'?"mmol/L":""}}</span>
         </li>
         <!-- <li>
           <label>干体重 : </label>
@@ -88,7 +88,7 @@
         <li v-if="isShow('钠')">
           <label>钠 : </label>
           <span class="content">{{sodium != '0'?sodium:""}}</span>
-          <span class="unit">{{sodium != '0'?"mmol/l":""}}</span>
+          <span class="unit">{{sodium != '0'?"mmol/L":""}}</span>
         </li>
         <li v-if="isShow('透析液流量')">
           <label>透析液流量 : </label>

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/dialysis/template/dialysisPrintOrderTwo.vue

@@ -63,9 +63,9 @@
                   </div>
                   <div class="inline_block" style="margin-left: 30px;">
                     透析机编号：
-                    <div class="under_line" style="width: 100px;">{{''}}</div>
+                    <div class="under_line" style="width: 100px;">{{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:''}}</div>
                     型号
-                    <div class="under_line" style="width: 100px;">{{''}}</div>
+                    <div class="under_line" style="width: 100px;">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
                   </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:19px;">
@@ -77,7 +77,7 @@
                   </div>
                   <div class="inline_block"  style="margin-left: 20px;">
                     出血：
-                    <check-box text="正常" :checked="predialysis.is_hemorrhage==2?true:false"></check-box>
+                    <check-box text="无" :checked="predialysis.is_hemorrhage==2?true:false"></check-box>
                     <check-box text="异常" :checked="predialysis.is_hemorrhage==1?true:false"></check-box>
                     （&nbsp;
                     <check-box text="穿刺点渗血" :checked="predialysis.is_hemorrhage==1&&predialysis.hemorrhage.indexOf('穿刺点渗血')>-1?true:false"></check-box>
@@ -144,8 +144,9 @@
                     中心静脉导管：
                     <check-box text="正常" :checked="predialysis.ductus_arantii.indexOf('正常')>-1?true:false"></check-box>
                     <check-box text="不畅" :checked="predialysis.ductus_arantii.indexOf('不畅')>-1?true:false"></check-box>
-                    <check-box text="血流不足(正接)" :checked="predialysis.ductus_arantii.indexOf('血流不足(正接)')>-1?true:false"></check-box>
-                    <check-box text="血流不足(反接)" :checked="predialysis.ductus_arantii.indexOf('血流不足(反接)')>-1?true:false"></check-box>
+                    <check-box text="血流不足" :checked="predialysis.ductus_arantii.indexOf('血流不足')>-1?true:false"></check-box>
+                    (<check-box text="正接" :checked="predialysis.ductus_arantii.indexOf('正接')>-1?true:false"></check-box>/
+                    <check-box text="反接" :checked="predialysis.ductus_arantii.indexOf('反接')>-1?true:false"></check-box>)
                     <check-box text="血栓" :checked="predialysis.ductus_arantii.indexOf('血栓')>-1?true:false"></check-box>
                     <check-box text="缝线脱落" :checked="predialysis.ductus_arantii.indexOf('缝线脱落')>-1?true:false"></check-box>
                     <check-box text="导管脱落" :checked="predialysis.ductus_arantii.indexOf('导管脱落')>-1?true:false"></check-box>
@@ -409,13 +410,13 @@
                     <check-box text="他人协助" :checked="afterdialysis.hemostasis_opera == 2?true:false"></check-box>
                     <check-box text="自己压迫" :checked="afterdialysis.hemostasis_opera == 3?true:false"></check-box>
                   </div>
-                  <div class="inline_block" style="margin-left: 30px;">
-                    实际超滤量：
-                    <div class="under_line" style="width: 50px;">
-                      {{prescription.ultrafiltration?prescription.ultrafiltration:'/'}}
-                    </div>
-                    L
-                  </div>
+                  <!--<div class="inline_block" style="margin-left: 30px;">-->
+                    <!--实际超滤量：-->
+                    <!--<div class="under_line" style="width: 50px;">-->
+                      <!--{{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:'/'}}-->
+                    <!--</div>-->
+                    <!--L-->
+                  <!--</div>-->
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:19px;">
                   <div class="inline_block">
@@ -675,26 +676,26 @@
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:24px;">
                   <div class="inline_block">
-                    透析液(mol/l)： &emsp;Ca<sup>2+</sup>：
+                    透析液(mmol/L)： &emsp;Ca<sup>2+</sup>：
                     <div class="under_line" style="width: 70px;">
                         <span v-if="prescription.calcium">{{getFloat(prescription.calcium)?getFloat(prescription.calcium):'/'}}</span>
                       <span v-else>{{'/'}}</span>
 
                     </div>
-                    mol/l &emsp;Na<sup>+</sup>：
+                    mmol/L &emsp;Na<sup>+</sup>：
                     <div class="under_line" style="width: 70px;">
                       <span v-if="prescription.sodium">{{getFloat(prescription.sodium)?getFloat(prescription.sodium):'/'}}</span>
                       <span v-else>{{'/'}}</span>
 
                     </div>
-                    mol/l &emsp;K<sup>+</sup>：
+                    mmol/L &emsp;K<sup>+</sup>：
                     <div class="under_line" style="width: 70px;">
                       <span v-if="prescription.kalium">{{getFloat(prescription.kalium)?getFloat(prescription.kalium):'/'}}</span>
                       <span v-else>{{'/'}}</span>
 
 
                     </div>
-                    mol/l
+                    mmol/L
                   </div>
                   <div class="inline_block" v-if="prescription.displace_liqui_part == 0">
                     &emsp;置换液后/前稀释 总量：

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

@@ -11,7 +11,7 @@
       <el-col :span="8">
         <el-table
           :data="propForm.goods"
-          ref=""
+          ref="table"
           border
           highlight-current-row
           max-height="250"
@@ -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/stock/config/goodInfo.vue

@@ -9,15 +9,16 @@
                       :isCreated="goodInfo.goodInfoDialog.isCreated" v-on:dialog-comfirm="goodInfoDialogComfirm"
                       v-on:dialog-cancle="goodInfoDialogCancle"></good-info-dailog>
 
+    <div class="cell clearfix" style="float: right">
+      <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="showInfoDialog">新增</el-button>
+    </div>
 
     <div class="cell clearfix">
       <el-input size="small" style="width: 400px;" class="filter-item" v-model="keywords"
                 placeholder="商品编码/规格名称"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
     </div>
-    <div class="cell clearfix" style="float: right">
-      <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="showInfoDialog">新增</el-button>
-    </div>
+
 
     <el-row :gutter="15">
       <el-col>

src/xt_pages/stock/config/goodType.vue

@@ -6,15 +6,18 @@
                       :visibility="goodType.goodTypeDialog.isVisibility"
                       :isCreated="goodType.goodTypeDialog.isCreated" v-on:dialog-comfirm="goodTypeDialogComfirm"
                       v-on:dialog-cancle="goodTypeDialogCancle"></good-type-dialog>
+
+    <div class="cell clearfix" style="float: right">
+      <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="showDialog">新增</el-button>
+    </div>
+
     <div class="cell clearfix">
       <el-input size="small" style="width: 400px;" class="filter-item" v-model="keywords"
                 placeholder="类型编码/类型名称"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
 
     </div>
-    <div class="cell clearfix" style="float: right">
-      <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="showDialog">新增</el-button>
-    </div>
+
     <el-row :gutter="15">
       <el-col>
 

src/xt_pages/stock/detail/print.vue

@@ -210,7 +210,6 @@
         return total
 
       }, calTotal(stock) {
-        console.log(stock)
 
         var array = []
         if (this.type == 1) {
@@ -223,7 +222,7 @@
         for (let i = 0; i < array.length; i++) {
           total_price = total_price + array[i].total_price
         }
-        return total_price
+        return  Math.floor(total_price * 100) / 100
       }, calTotalPrice() {
 
         var amountPrice = 0
@@ -243,9 +242,26 @@
               total_price = total_price + obj.query_warehouseout_info[a].total_price
             }
           }
-          amountPrice = amountPrice + total_price
+
+          amountPrice = amountPrice +  Math.floor(total_price* 100) / 100
+        }
+        return Math.floor(amountPrice* 100) / 100
+      }, getTotal: function(price, total) {
+        var m = 0, r1, r2
+        var s1 = price.toString()
+        var s2 = total.toString()
+        try {
+          m += s1.split('.')[1].length
+        } catch (e) {
+
+        }
+        try {
+        } catch (e) {
+          m += s2.split('.')[1].length
         }
-        return amountPrice
+        r1 = Number(price.toString().replace('.', ''))
+        r2 = Number(total.toString().replace('.', ''))
+        return r1 * r2 / Math.pow(10, m)
       }
     },
     created() {

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>
+                <editor ref="editor"
+                         id="editor"
+                         style="width: 600px"
+                         v-bind:r_content="new_content">
+                </editor>
+              </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>
+                <editor ref="edit_neditor"
+                         id="edit_editor"
+                         style="width: 600px"
+                         v-bind:r_content="edit_new_content">
+                </editor>
+              </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 Editor from '@/components/Editor'
+
   import {
     createCourseOfDiseaseRecord,
     deleteCourseOfDiseaseRecords,
@@ -151,7 +167,8 @@
     name: 'CourseOfDisease',
     components: {
       PatientSidebar,
-      BreadCrumb
+      BreadCrumb,
+      Editor
     },
     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

src/xt_pages/workforce/components/tableData.vue

@@ -92,7 +92,7 @@
               <schedule-item slot-scope="scope" :schedule-detail="scope.row.Sun_N"></schedule-item>
             </el-table-column>
         </el-table-column>
-        
+
         <el-table-column prop="total" label="总数" width="60" align="center" fixed="right"></el-table-column>
       </el-table>
 
@@ -217,7 +217,7 @@
               <el-input v-model="currentData.schedule_date" disabled></el-input>
             </el-form-item>
             <el-form-item label="班次: " prop="schedule_type">
-              <el-select v-model="changeSchedule.schedule_type" placeholder="请选择" style="width:100%">
+              <el-select v-model="changeSchedule.schedule_type" placeholder="请选择" style="width:100%" @change="changeScheduleType">
                 <el-option
                   v-for="item in scheduleType"
                   :key="item.id"
@@ -227,19 +227,19 @@
               </el-select>
             </el-form-item>
             <el-form-item label="病房: " prop="partition_id">
-              <el-select v-model="changeSchedule.partition_id" placeholder="请选择" style="width:100%" @change="changePartition">
+              <el-select v-model="zone_name" placeholder="请选择" style="width:100%" @change="changePartition">
                 <el-option
-                  v-for="item in partitions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
+                  v-for="item,index in zone_names"
+                  :key="index"
+                  :label="item"
+                  :value="item">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="透析机: " prop="bed_id">
-              <el-select v-model="changeSchedule.bed_id" placeholder="请选择" style="width:100%">
+              <el-select v-model="device_id" placeholder="请选择" style="width:100%">
                 <el-option
-                  v-for="item in jihaos"
+                  v-for="item in current_devices"
                   :key="item.id"
                   :label="item.number"
                   :value="item.id">
@@ -247,6 +247,7 @@
               </el-select>
             </el-form-item>
           </el-form>
+
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="jhDialogVisible = false">取 消</el-button>
@@ -259,7 +260,7 @@
 
 <script>
 
-import { getWeekPanels, getSchedules, getSchedulePatients, CreateSchedule, CancelSchedule, ChangeSchedule } from '@/api/schedule'
+import { getWeekPanels, getSchedules, getSchedulePatients, CreateSchedule, CancelSchedule, ChangeSchedule,getUrgentScheduleInitData} from '@/api/schedule'
 import ScheduleItem from './ScheduleItem'
 
 let rowNumber = 0
@@ -367,7 +368,16 @@ export default {
       changing_mode: false,
       changing_bed: false,
 
-      tableHeight: document.documentElement.clientHeight
+      tableHeight: document.documentElement.clientHeight,
+
+      origin_schedules:[],
+      origin_device_numbers:[],
+      zone_device_map:{},
+      device_id:0,
+      zone_name: '',
+      current_devices: [],
+      zone_names: [],
+      zone_device_options:[],
     }
   },
 
@@ -561,6 +571,9 @@ export default {
                 }
               })
             }
+            console.log(that.scheduleZone)
+            console.log(theSchedules)
+
           })
         } else {
           this.$message.error('网络错误')
@@ -744,52 +757,65 @@ export default {
             this.$message.error('数据异常')
             return false
           }
-          var weekPathKey = weekPath[0] + '_' + weekPath[1]
-          for (var index in this.scheduleZone) {
-            if (this.scheduleZone[index].jihao_id == this.changeSchedule.bed_id) {
-              if (this.scheduleZone[index][weekPathKey].mode_id > 0) {
-                this.$message.error('选中的区域已经存在排班，不能再排班！')
-                return false
-              }
-              this.changeSchedule.partition_type = this.scheduleZone[index].zone_type
-              break
+
+          this.changeSchedule.bed_id = this.device_id
+          for (let i =0; i <this.origin_device_numbers.length; i++ ){
+            if(this.origin_device_numbers[i].id == this.device_id){
+              this.changeSchedule.partition_id = this.origin_device_numbers[i].zone_id
             }
           }
 
+          // console.log(this.scheduleZone)
+
+
+          this.changeSchedule.change_action = 'change_device'
+          this.changeScheduleActon(formName)
+
+          // this.changeSchedule.spartition_type = this.scheduleZone[index].zone_type
+          // var weekPathKey = weekPath[0] + '_' + weekPath[1]
+          // for (var index in this.scheduleZone) {
+          //   if (this.scheduleZone[index].jihao_id == this.changeSchedule.bed_id) {
+          //     if (this.scheduleZone[index][weekPathKey].mode_id > 0) {
+          //       this.$message.error('选中的区域已经存在排班，不能再排班！')
+          //       return false
+          //     }
+          //     break
+          //   }
+          // }
+
           // 可能
           // 患者有传染病，与选择的机器类型（传染病）不匹配
           // 患者没有传染病，但机器是某个传染病的专用透析器
           // 机器的透析模式与患者不匹配
 
-          if (this.currentData.contagions.length > 0) {
-            var cflag = false
-            for (var index in this.currentData.contagions) {
-              if (this.currentData.contagions[index].disease_id == this.changeSchedule.partition_type) {
-                cflag = true
-              }
-            }
-            if (!cflag) {
-              this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
-                .then(() => {
-                  this.changeSchedule.change_action = 'change_device'
-                  this.changeScheduleActon(formName)
-                }).catch(() => {
-                })
-            } else {
-              this.changeSchedule.change_action = 'change_device'
-              this.changeScheduleActon(formName)
-            }
-          } else if (this.changeSchedule.partition_type > 1) {
-            this.$confirm('此患者没有传染病，与此透析机不匹配，确定在此排班吗?', '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
-              .then(() => {
-                this.changeSchedule.change_action = 'change_device'
-                this.changeScheduleActon(formName)
-              }).catch(() => {
-              })
-          } else {
-            this.changeSchedule.change_action = 'change_device'
-            this.changeScheduleActon(formName)
-          }
+          // if (this.currentData.contagions.length > 0) {
+          //   var cflag = false
+          //   for (var index in this.currentData.contagions) {
+          //     if (this.currentData.contagions[index].disease_id == this.changeSchedule.partition_type) {
+          //       cflag = true
+          //     }
+          //   }
+          //   if (!cflag) {
+          //     this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
+          //       .then(() => {
+          //
+          //       }).catch(() => {
+          //       })
+          //   } else {
+          //     this.changeSchedule.change_action = 'change_device'
+          //     this.changeScheduleActon(formName)
+          //   }
+          // } else if (this.changeSchedule.partition_type > 1) {
+          //   this.$confirm('此患者没有传染病，与此透析机不匹配，确定在此排班吗?', '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
+          //     .then(() => {
+          //       this.changeSchedule.change_action = 'change_device'
+          //       this.changeScheduleActon(formName)
+          //     }).catch(() => {
+          //     })
+          // } else {
+          //   this.changeSchedule.change_action = 'change_device'
+          //   this.changeScheduleActon(formName)
+          // }
         }
       })
     },
@@ -831,12 +857,60 @@ export default {
     },
 
     changePartition(value) {
-      if (typeof (this.partitions[value].jihaos) !== 'undefined') {
-        this.jihaos = this.partitions[value].jihaos
-      } else {
-        this.jihaos = []
+      this.current_devices = this.zone_device_map[value]
+      this.device_id = this.current_devices[0].id
+
+    },changeScheduleType(schedule_type){
+      let params = {
+        type: schedule_type
       }
-      this.changeSchedule.bed_id = ''
+      getUrgentScheduleInitData(params).then(rs => {
+        if (rs.data.state == 1) {
+          this.origin_schedules = rs.data.data.schedules
+          this.patients = rs.data.data.patients
+          this.modes = rs.data.data.modes
+          this.origin_device_numbers = rs.data.data.device_numbers
+
+          for (let i = this.origin_schedules.length-1; i >= 0 ; i--) {
+            for (let y = this.origin_device_numbers.length-1; y >=0 ; y--){
+              if(this.origin_device_numbers[y].id == this.origin_schedules[i].bed_id){
+                this.origin_device_numbers.splice(y,1)
+              }
+            }
+          }
+
+
+          var zone_device_map = {}
+          for (let index = 0; index < this.origin_device_numbers.length; index++) {
+            const device_number = this.origin_device_numbers[index]
+            if (zone_device_map[device_number.zone.name] == null || zone_device_map[device_number.zone.name] == undefined) {
+              zone_device_map[device_number.zone.name] = []
+            }
+            zone_device_map[device_number.zone.name].push(device_number)
+          }
+          this.zone_device_map = zone_device_map
+
+          this.zone_names = Object.keys(this.zone_device_map)
+          if (this.zone_names.length > 0) {
+            this.zone_name = this.zone_names[0]
+            this.current_devices = this.zone_device_map[this.zone_name]
+            this.device_id = this.current_devices[0].id
+          }
+          this.zone_device_options = [
+            {values: this.zone_names},
+            // { values: this.getDeviceNumberNames(this.current_devices) },
+            {values: this.current_devices},
+          ]
+        } else {
+          Toast.fail(rs.data.msg)
+        }
+
+      }).catch(err => {
+        this.loading = false
+        Toast.fail(err)
+      })
+
+
     },
     submitTiaoX() {
       // if (this.tiaoZhengType==1) {
@@ -868,6 +942,62 @@ export default {
           } else {
             this.jihaos = []
           }
+          let params = {
+            type: this.currentData.schedule_type
+          }
+          getUrgentScheduleInitData(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+            } else {
+
+              if (response.data.state == 1) {
+                this.origin_schedules = response.data.data.schedules
+                this.origin_device_numbers = response.data.data.device_numbers
+
+                for (let i = this.origin_schedules.length-1; i >= 0 ; i--) {
+                  for (let y = this.origin_device_numbers.length-1; y >=0 ; y--){
+                    if(this.origin_device_numbers[y].id == this.origin_schedules[i].bed_id){
+                      this.origin_device_numbers.splice(y,1)
+                    }
+                  }
+                }
+
+                var zone_device_map = {}
+                for (let index = 0; index < this.origin_device_numbers.length; index++) {
+                  const device_number = this.origin_device_numbers[index]
+                  if (zone_device_map[device_number.zone.name] == null || zone_device_map[device_number.zone.name] == undefined) {
+                    zone_device_map[device_number.zone.name] = []
+                  }
+                  zone_device_map[device_number.zone.name].push(device_number)
+                }
+                this.zone_device_map = zone_device_map
+
+                this.zone_names = Object.keys(this.zone_device_map)
+                if (this.zone_names.length > 0) {
+                  this.zone_name = this.zone_names[0]
+                  this.current_devices = this.zone_device_map[this.zone_name]
+                  this.device_id = this.current_devices[0].id
+                }
+
+
+                this.zone_device_options = [
+                  {values: this.zone_names},
+                  // { values: this.getDeviceNumberNames(this.current_devices) },
+                  {values: this.current_devices},
+                ]
+
+
+              } else {
+                Toast.fail(rs.data.msg)
+              }
+
+
+            }
+          }).catch(err => {
+            this.$message.error(err)
+          })
+
+
 
           this.tzDialogVisible = false
           this.jhDialogVisible = true
@@ -1063,6 +1193,8 @@ export default {
 
     this.partitions = this.partitionsProp
 
+    console.log(this.partitions)
+
     var contagions = this.$store.getters.contagions
     if (contagions.length > 0) {
       var that = this
@@ -1073,6 +1205,7 @@ export default {
       })
     }
     this.scheduleZoneRow = this.scheduleZoneRowProp
+    console.log(this.scheduleZoneRow)
 
     this.weekday = (new Date()).getDay()
     if (this.weekday == 0) {

src/xt_permission.js

@@ -10,19 +10,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
 
   NProgress.start()